X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fentry.cpp;h=36658dae18c0cf90bf73642a8ea77eab364f9ef1;hb=b600936dca600693729eb800b6952070f204a63f;hp=54c5fb7cbcdd49fc48f06dae0761c9843fd6b0de;hpb=bbc49b78e8b766fc695ab90fdbe00f579882fc99;p=libs%2Fgltk.git

diff --git a/source/entry.cpp b/source/entry.cpp
index 54c5fb7..36658da 100644
--- a/source/entry.cpp
+++ b/source/entry.cpp
@@ -62,6 +62,9 @@ void Entry::set_text(const string &t)
 
 void Entry::insert(unsigned pos, const string &t)
 {
+	if(t.empty())
+		return;
+
 	text.insert(pos, t);
 
 	unsigned old_edit_pos = edit_pos;
@@ -70,6 +73,7 @@ void Entry::insert(unsigned pos, const string &t)
 	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);
 
@@ -81,6 +85,9 @@ void Entry::insert(unsigned pos, const string &t)
 
 void Entry::erase(unsigned pos, unsigned len)
 {
+	if(!len)
+		return;
+
 	text.erase(pos, len);
 
 	unsigned old_edit_pos = edit_pos;
@@ -96,6 +103,7 @@ void Entry::erase(unsigned pos, unsigned len)
 			selection_pos = pos;
 	}
 
+	signal_text_changed.emit(text.get());
 	if(edit_pos!=old_edit_pos)
 		signal_edit_position_changed.emit(edit_pos);
 
@@ -255,14 +263,14 @@ bool Entry::key_press(unsigned key, unsigned mod)
 	if(key==Input::KEY_BACKSPACE)
 	{
 		if(selection_active)
-			erase_selection();
+			erase_selection(true);
 		else if(edit_pos>0)
 			erase(edit_pos-1, 1);
 	}
 	else if(key==Input::KEY_DELETE)
 	{
 		if(selection_active)
-			erase_selection();
+			erase_selection(true);
 		else
 			erase(edit_pos, 1);
 	}
@@ -299,7 +307,7 @@ bool Entry::character(wchar_t ch)
 	if(got_key_press && ch>=' ' && ch!=0x7F)
 	{
 		if(selection_active)
-			erase_selection();
+			erase_selection(false);
 		insert(edit_pos, StringCodec::encode<StringCodec::Utf8>(StringCodec::ustring(1, ch)));
 		return true;
 	}
@@ -406,13 +414,15 @@ void Entry::set_edit_position(unsigned ep, bool select)
 	rebuild();
 }
 
-void Entry::erase_selection()
+void Entry::erase_selection(bool emit_change)
 {
 	unsigned start, end;
 	if(!get_selection(start, end))
 		return;
 
 	text.erase(start, end-start);
+	if(emit_change)
+		signal_text_changed.emit(text.get());
 	set_edit_position(start, false);
 }
 
@@ -448,10 +458,13 @@ void Entry::check_view_range()
 	else if(row>=first_row+visible_rows)
 		first_row = row+1-visible_rows;
 
+	unsigned scroll = max(text.get_n_lines(), visible_rows)-visible_rows;
+	if(first_row>scroll)
+		first_row = scroll;
+
 	if(first_row!=old_first_row)
 		signal_scroll_position_changed.emit(first_row);
 
-	unsigned scroll = max(text.get_n_lines(), visible_rows)-visible_rows;
 	slider->set_range(0, scroll);
 	slider->set_value(scroll-first_row);
 }