Add a signal for selection changes in Entry

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

diff --git a/source/entry.cpp b/source/entry.cpp
index 3212d85b1691a0082670f8dba996f1adc24193fe..f75f2005bc2cdd880d4960cf26b6f1db2cde6cf1 100644 (file)
--- a/source/entry.cpp
+++ b/source/entry.cpp
@@ -395,6 +395,7 @@ void Entry::move_edit_position(Navigation nav, bool select)
 void Entry::adjust_edit_position_for_change(unsigned pos, int change)
 {
        unsigned old_edit_pos = edit_pos;
+       unsigned old_select_pos = selection_pos;
 
        if(change>0)
        {
@@ -407,16 +408,23 @@ void Entry::adjust_edit_position_for_change(unsigned pos, int change)
        {
                if(edit_pos>=pos)
                        edit_pos -= min<unsigned>(edit_pos-pos, -change);
-               if(selection_active)
+               if(selection_active && selection_pos>=pos)
                        selection_pos -= min<unsigned>(selection_pos-pos, -change);
        }
 
        if(edit_pos!=old_edit_pos)
                signal_edit_position_changed.emit(edit_pos);
+       if(selection_active && (edit_pos!=old_edit_pos || selection_pos!=old_select_pos))
+       {
+               unsigned start, end;
+               if(get_selection(start, end))
+                       signal_selection_changed.emit(start, end);
+       }
 }
 
 void Entry::set_edit_position(unsigned ep, bool select)
 {
+       bool selection_was_active = selection_active;
        if(select && !selection_active)
                selection_pos = edit_pos;
        selection_active = select;
@@ -425,7 +433,14 @@ void Entry::set_edit_position(unsigned ep, bool select)
        edit_pos = min(ep, text.size());
 
        if(edit_pos!=old_edit_pos)
+       {
                signal_edit_position_changed.emit(edit_pos);
+               unsigned start, end;
+               if(get_selection(start, end))
+                       signal_selection_changed.emit(start, end);
+               else if(selection_was_active)
+                       signal_selection_changed.emit(edit_pos, edit_pos);
+       }
 
        if(multiline)
                check_view_range();