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

diff --git a/source/entry.cpp b/source/entry.cpp
index 1c66f98..53cb090 100644
--- a/source/entry.cpp
+++ b/source/entry.cpp
@@ -161,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")
@@ -205,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);
 			}
 
@@ -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)
 	{
@@ -413,10 +414,17 @@ void Entry::adjust_edit_position_for_change(unsigned pos, int 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();