Refactor edit position adjustments from Entry::insert and delete

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

diff --git a/source/entry.cpp b/source/entry.cpp
index 606f447b68c99ffdf8da7fce0495ed4709a73610..3212d85b1691a0082670f8dba996f1adc24193fe 100644 (file)
--- a/source/entry.cpp
+++ b/source/entry.cpp
@@ -5,8 +5,8 @@
 #include "entry.h"
 #include "graphic.h"
 #include "part.h"
+#include "slider.h"
 #include "style.h"
-#include "vslider.h"
 
 using namespace std;
 
@@ -70,21 +70,13 @@ void Entry::insert(unsigned pos, const string &t)
                return;
 
        text.insert(pos, t);
-
-       unsigned old_edit_pos = edit_pos;
-       if(edit_pos>=pos)
-               edit_pos += t.size();
-       if(selection_active && selection_pos>=pos)
-               selection_pos += t.size();
-
        signal_text_changed.emit(text.get());
-       if(edit_pos!=old_edit_pos)
-               signal_edit_position_changed.emit(edit_pos);
 
+       adjust_edit_position_for_change(pos, t.size());
        if(multiline)
                check_view_range();
 
-       rebuild();
+       mark_rebuild();
 }
 
 void Entry::erase(unsigned pos, unsigned len)
@@ -93,28 +85,13 @@ void Entry::erase(unsigned pos, unsigned len)
                return;
 
        text.erase(pos, len);
-
-       unsigned old_edit_pos = edit_pos;
-       if(edit_pos>=pos+len)
-               edit_pos -= len;
-       else if(edit_pos>=pos)
-               edit_pos = pos;
-       if(selection_active)
-       {
-               if(selection_pos>=pos+len)
-                       selection_pos -= len;
-               else if(selection_pos>=pos)
-                       selection_pos = pos;
-       }
-
        signal_text_changed.emit(text.get());
-       if(edit_pos!=old_edit_pos)
-               signal_edit_position_changed.emit(edit_pos);
 
+       adjust_edit_position_for_change(pos, -len);
        if(multiline)
                check_view_range();
 
-       rebuild();
+       mark_rebuild();
 }
 
 bool Entry::get_selection(unsigned &start, unsigned &end) const
@@ -158,7 +135,7 @@ void Entry::set_multiline(bool m)
                        add(*slider);
                        slider->set_step(1);
                        slider->signal_value_changed.connect(sigc::mem_fun(this, &Entry::slider_value_changed));
-                       rebuild();
+                       mark_rebuild();
                }
                check_view_range();
        }
@@ -366,10 +343,10 @@ bool Entry::navigate(Navigation nav)
 void Entry::animate(const Time::TimeDelta &)
 {
        cursor_blink = !cursor_blink;
-       rebuild();
+       mark_rebuild();
 }
 
-void Entry::on_geometry_change()
+void Entry::on_size_change()
 {
        if(multiline)
                check_view_range();
@@ -415,6 +392,29 @@ void Entry::move_edit_position(Navigation nav, bool select)
                throw invalid_argument("Entry::move_edit_position");
 }
 
+void Entry::adjust_edit_position_for_change(unsigned pos, int change)
+{
+       unsigned old_edit_pos = edit_pos;
+
+       if(change>0)
+       {
+               if(edit_pos>=pos)
+                       edit_pos += change;
+               if(selection_active && selection_pos>=pos)
+                       selection_pos += change;
+       }
+       else if(change<0)
+       {
+               if(edit_pos>=pos)
+                       edit_pos -= min<unsigned>(edit_pos-pos, -change);
+               if(selection_active)
+                       selection_pos -= min<unsigned>(selection_pos-pos, -change);
+       }
+
+       if(edit_pos!=old_edit_pos)
+               signal_edit_position_changed.emit(edit_pos);
+}
+
 void Entry::set_edit_position(unsigned ep, bool select)
 {
        if(select && !selection_active)
@@ -429,7 +429,7 @@ void Entry::set_edit_position(unsigned ep, bool select)
 
        if(multiline)
                check_view_range();
-       rebuild();
+       mark_rebuild();
 }
 
 void Entry::erase_selection(bool emit_change)
@@ -446,18 +446,21 @@ void Entry::erase_selection(bool emit_change)
 
 void Entry::check_cursor_blink()
 {
+       const Part *cursor_part = style->get_part("cursor");
+       bool has_blink = (cursor_part && cursor_part->get_graphic(ACTIVE|FOCUS)!=cursor_part->get_graphic(NORMAL|FOCUS));
+
        cursor_blink = (state&FOCUS);
-       if((state&FOCUS) && style)
+       if((state&FOCUS) && style && has_blink)
        {
-               const Part *cursor_part = style->get_part("cursor");
-               if(cursor_part && cursor_part->get_graphic(ACTIVE|FOCUS)!=cursor_part->get_graphic(NORMAL|FOCUS))
-               {
-                       set_animation_interval(Time::sec/2);
-                       return;
-               }
+               set_animation_interval(Time::sec/2);
+               mark_rebuild();
+       }
+       else
+       {
+               if(has_blink)
+                       mark_rebuild();
+               stop_animation();
        }
-
-       stop_animation();
 }
 
 void Entry::check_view_range()
@@ -484,6 +487,7 @@ void Entry::check_view_range()
                signal_scroll_position_changed.emit(first_row);
 
        slider->set_range(0, scroll);
+       slider->set_page_size(visible_rows);
        slider->set_value(scroll-first_row);
 }
 
@@ -495,6 +499,7 @@ void Entry::slider_value_changed(double value)
                first_row = text.get_n_lines()-visible_rows-static_cast<unsigned>(value);
                if(first_row!=old_first_row)
                        signal_scroll_position_changed.emit(first_row);
+               mark_rebuild();
        }
 }