X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fentry.cpp;h=f75f2005bc2cdd880d4960cf26b6f1db2cde6cf1;hb=b391f4b774d17c53dfd9062fc7c7a6b14f72f926;hp=83ed563298b793b919d31d1a7bc442b0d3b24e2d;hpb=ab9fd8084f8bf8770d8d968354550cb2df99192f;p=libs%2Fgltk.git

diff --git a/source/entry.cpp b/source/entry.cpp
index 83ed563..f75f200 100644
--- a/source/entry.cpp
+++ b/source/entry.cpp
@@ -70,17 +70,9 @@ 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();
 
@@ -93,24 +85,9 @@ 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();
 
@@ -415,8 +392,39 @@ 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;
+	unsigned old_select_pos = selection_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>=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();
@@ -487,6 +502,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);
 }