Collapse the two implementations of Entry::set_edit_position

[libs/gltk.git] / source / entry.cpp

diff --git a/source/entry.cpp b/source/entry.cpp
index 70321dc5a68cf029128f07c52e9b06f44ea38f91..19bb7cc48b9f038d86d95401941e5b30f71cbe02 100644 (file)
--- a/source/entry.cpp
+++ b/source/entry.cpp
@@ -93,18 +93,6 @@ void Entry::erase(unsigned pos, unsigned len)
 
        if(multiline)
                check_view_range();
-
-       rebuild();
-}
-
-void Entry::set_edit_position(unsigned pos)
-{
-       edit_pos = min(pos, text.size());
-       selection_active = false;
-
-       if(multiline)
-               check_view_range();
-
        rebuild();
 }
 
@@ -252,25 +240,17 @@ bool Entry::key_press(unsigned key, unsigned mod)
                if(selection_active)
                        erase_selection();
                else if(edit_pos>0)
-               {
-                       text.erase(--edit_pos, 1);
-                       check_view_range();
-                       rebuild();
-               }
+                       erase(edit_pos-1, 1);
        }
        else if(key==Input::KEY_DELETE)
        {
                if(selection_active)
                        erase_selection();
                else
-                       text.erase(edit_pos, 1);
+                       erase(edit_pos, 1);
        }
        else if(key==Input::KEY_ENTER && multiline)
-       {
-               text.insert(edit_pos++, "\n");
-               check_view_range();
-               rebuild();
-       }
+               insert(edit_pos, "\n");
        else if(key==Input::KEY_END)
        {
                unsigned row, col;
@@ -303,9 +283,7 @@ bool Entry::character(wchar_t ch)
        {
                if(selection_active)
                        erase_selection();
-               text.insert(edit_pos, StringCodec::encode<StringCodec::Utf8>(StringCodec::ustring(1, ch)));
-               ++edit_pos;
-               rebuild();
+               insert(edit_pos, StringCodec::encode<StringCodec::Utf8>(StringCodec::ustring(1, ch)));
                return true;
        }
 
@@ -400,8 +378,9 @@ void Entry::set_edit_position(unsigned ep, bool select)
                selection_pos = edit_pos;
        selection_active = select;
 
-       edit_pos = ep;
-       check_view_range();
+       edit_pos = min(ep, text.size());
+       if(multiline)
+               check_view_range();
        rebuild();
 }
 
@@ -440,11 +419,7 @@ void Entry::check_view_range()
        if(!multiline || !text_part)
                return;
 
-       float font_size = style->get_font_size();
-       unsigned line_spacing = static_cast<unsigned>(font_size*6/5);
-
-       const Sides &margin = text_part->get_margin();
-       visible_rows = max((geom.h-margin.top-margin.bottom)/line_spacing, 1U);
+       visible_rows = text.get_visible_lines(*text_part, geom, 0);
 
        unsigned row, col;
        text.offset_to_coords(edit_pos, row, col);