X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fentry.cpp;h=5aadbc262d355805e3b4fe338714a2a0bb8d4311;hb=81c4024fb6acf37df702a803dc4efdf82a81525a;hp=3212d85b1691a0082670f8dba996f1adc24193fe;hpb=43625734822bdaaea4e42505b7040d404298721c;p=libs%2Fgltk.git

diff --git a/source/entry.cpp b/source/entry.cpp
index 3212d85..5aadbc2 100644
--- a/source/entry.cpp
+++ b/source/entry.cpp
@@ -13,20 +13,7 @@ using namespace std;
 namespace Msp {
 namespace GLtk {
 
-Entry::Entry(const string &t):
-	text(),
-	multiline(false),
-	edit_width(10),
-	edit_height(1),
-	edit_pos(0),
-	first_row(0),
-	visible_rows(1),
-	text_part(0),
-	slider(0),
-	got_key_press(false),
-	cursor_blink(true),
-	selection_active(false),
-	selection_pos(0)
+Entry::Entry(const string &t)
 {
 	input_type = INPUT_TEXT;
 	set_text(t);
@@ -161,7 +148,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 +192,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);
 			}
 
@@ -332,8 +319,6 @@ bool Entry::navigate(Navigation nav)
 {
 	if(nav==NAV_LEFT || nav==NAV_RIGHT || ((nav==NAV_DOWN || nav==NAV_UP) && multiline))
 		move_edit_position(nav, false);
-	else if(nav==NAV_ACCEPT && !signal_enter.empty())
-		signal_enter.emit();
 	else
 		return false;
 
@@ -358,7 +343,7 @@ void Entry::on_style_change()
 
 	if(!style)
 	{
-		text_part = 0;
+		text_part = nullptr;
 		return;
 	}
 
@@ -395,6 +380,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 +393,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 +418,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();
@@ -468,7 +468,7 @@ void Entry::check_view_range()
 	if(!multiline || !text_part)
 		return;
 
-	visible_rows = text.get_visible_lines(*text_part, geom, 0);
+	visible_rows = text.get_visible_lines(*text_part, geom, nullptr);
 
 	unsigned row, col;
 	text.offset_to_coords(edit_pos, row, col);