X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fentry.cpp;h=53cb09048472cfb582de5df4cd6c7edf915f9310;hb=6deafc9f236b90175a303944815f7c0eac1c95c1;hp=ed0d7e2081a270a90894277f619f33c4daf4aeb5;hpb=878faa0c9283ee1e6e5e67b6ea1324cc52385742;p=libs%2Fgltk.git

diff --git a/source/entry.cpp b/source/entry.cpp
index ed0d7e2..53cb090 100644
--- 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,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();
 
@@ -184,7 +161,7 @@ void Entry::rebuild_special(const Part &part)
 		Geometry rgeom = text.coords_to_geometry(*text_part, geom, first_row, row, col);
 
 		GL::MeshBuilder bld(part_cache.create_mesh(part, *graphic->get_texture()));
-		bld.matrix() *= GL::Matrix::translation(rgeom.x, rgeom.y, 0);
+		bld.transform(GL::Matrix::translation(rgeom.x, rgeom.y, 0));
 		graphic->build(part.get_geometry().w, part.get_geometry().h, bld);
 	}
 	else if(part.get_name()=="selection")
@@ -228,7 +205,7 @@ void Entry::rebuild_special(const Part &part)
 				Geometry egeom = text.coords_to_geometry(*text_part, geom, first_row, row, ec);
 
 				GL::MeshBuilder bld(part_cache.create_mesh(part, *graphic->get_texture()));
-				bld.matrix() *= GL::Matrix::translation(rgeom.x, rgeom.y, 0);
+				bld.transform(GL::Matrix::translation(rgeom.x, rgeom.y, 0));
 				graphic->build(egeom.x-rgeom.x, part.get_geometry().h, bld);
 			}
 
@@ -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();
@@ -446,18 +461,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 +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);
 }