mewin/nana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove deprecated code

Browse Source
This commit is contained in:
Jinhao 2017-05-30 04:50:10 +08:00
parent b1f3df1b27
commit 2f21c33392
2 changed files with 13 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/nana/gui/widgets/skeletons/text_editor.hpp
View File

@ -244,7 +244,6 @@ namespace nana{ namespace widgets
static bool _m_resolve_text(const ::std::wstring&, std::vector<std::pair<std::size_t, std::size_t>> & lines); static bool _m_resolve_text(const ::std::wstring&, std::vector<std::pair<std::size_t, std::size_t>> & lines);
bool _m_cancel_select(int align); bool _m_cancel_select(int align);
unsigned _m_tabs_pixels(size_type tabs) const;
nana::size _m_text_extent_size(const char_type*, size_type n) const; nana::size _m_text_extent_size(const char_type*, size_type n) const;
/// Adjust position of view to make caret stay in screen /// Adjust position of view to make caret stay in screen

42
source/gui/widgets/skeletons/text_editor.cpp
View File

@ -1969,6 +1969,7 @@ namespace nana{ namespace widgets
points_.caret.x ++; points_.caret.x ++;
_m_reset_content_size();
if (!refresh) if (!refresh)
{ {
@ -1978,7 +1979,6 @@ namespace nana{ namespace widgets
else else
impl_->try_refresh = sync_graph::refresh; impl_->try_refresh = sync_graph::refresh;
_m_reset_content_size();
} }
void text_editor::copy() const void text_editor::copy() const
@ -2590,15 +2590,15 @@ namespace nana{ namespace widgets
else else
scrpos.x += _m_text_x(*sct_ptr); scrpos.x += _m_text_x(*sct_ptr);
scrpos.y = static_cast<int>(lines * line_height());
if (!to_screen_coordinate) if (!to_screen_coordinate)
{ {
scrpos.y = static_cast<int>(lines * line_height());
//_m_text_x includes origin x and text_area x. remove these factors //_m_text_x includes origin x and text_area x. remove these factors
scrpos.x += (impl_->cview->origin().x - text_area_.area.x); scrpos.x += (impl_->cview->origin().x - text_area_.area.x);
} }
else else
scrpos.y = static_cast<int>(lines * line_height()) - impl_->cview->origin().y + this->_m_text_top_base(); scrpos.y += this->_m_text_top_base() - impl_->cview->origin().y;
return scrpos; return scrpos;
} }
@ -2641,8 +2641,7 @@ namespace nana{ namespace widgets
auto str_px = static_cast<int>(_m_text_extent_size(ent.begin, ent.end - ent.begin).width); auto str_px = static_cast<int>(_m_text_extent_size(ent.begin, ent.end - ent.begin).width);
if (scrpos.x <= str_px) if (scrpos.x <= str_px)
{ {
res.x += _m_char_by_pixels(ent, scrpos.x); res.x += _m_char_by_pixels(ent, scrpos.x) + static_cast<unsigned>(ent.begin - text_ptr);
res.x += static_cast<unsigned>(ent.begin - text_ptr);
return res; return res;
} }
scrpos.x -= str_px; scrpos.x -= str_px;
@ -2947,6 +2946,7 @@ namespace nana{ namespace widgets
if (get_selected_points(a, b)) if (get_selected_points(a, b))
{ {
auto & textbase = this->textbase(); auto & textbase = this->textbase();
if (a.y != b.y) if (a.y != b.y)
{ {
text = textbase.getline(a.y).substr(a.x); text = textbase.getline(a.y).substr(a.x);
@ -2959,7 +2959,7 @@ namespace nana{ namespace widgets
text += textbase.getline(b.y).substr(0, b.x); text += textbase.getline(b.y).substr(0, b.x);
} }
else else
text = textbase.getline(a.y).substr(a.x, b.x - a.x); return textbase.getline(a.y).substr(a.x, b.x - a.x);
} }
return text; return text;
@ -3034,22 +3034,16 @@ namespace nana{ namespace widgets
bool text_editor::_m_cancel_select(int align) bool text_editor::_m_cancel_select(int align)
{ {
nana::upoint a, b; upoint a, b;
if (get_selected_points(a, b)) if (get_selected_points(a, b))
{ {
switch(align) //domain of algin = [0, 2]
if (align)
{ {
case 1: this->points_.caret = (1 == align ? a : b);
points_.caret = a;
//_m_move_offset_x_while_over_border(-2); //deprecated
this->_m_adjust_view(); this->_m_adjust_view();
break;
case 2:
points_.caret = b;
//_m_move_offset_x_while_over_border(2); //deprecated
this->_m_adjust_view();
break;
} }
select_.a = select_.b = points_.caret; select_.a = select_.b = points_.caret;
reset_caret(); reset_caret();
return true; return true;
@ -3057,15 +3051,6 @@ namespace nana{ namespace widgets
return false; return false;
} }
unsigned text_editor::_m_tabs_pixels(size_type tabs) const
{
if(0 == tabs) return 0;
wchar_t ws[2] = {};
ws[0] = mask_char_ ? mask_char_ : ' ';
return static_cast<unsigned>(tabs * graph_.text_extent_size(ws).width * text_area_.tab_space);
}
nana::size text_editor::_m_text_extent_size(const char_type* str, size_type n) const nana::size text_editor::_m_text_extent_size(const char_type* str, size_type n) const
{ {
if(mask_char_) if(mask_char_)
@ -3113,9 +3098,6 @@ namespace nana{ namespace widgets
} }
} }
//upoint pos2nd;
//this->_m_pos_secondary(points_.caret, pos2nd); //deprecated
auto extra_px = static_cast<int>(line_px * extra_count_vert); auto extra_px = static_cast<int>(line_px * extra_count_vert);
if (coord.y < origin.y) if (coord.y < origin.y)