X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fentry.cpp;h=43dad5e7de46dbcb69569427c083352eee0aabac;hb=6d73e04329fc3752552773e4d11d7374caf779f6;hp=12eff06ae4ffbc542e3b80726242b60ea03ee4ee;hpb=ec63df81f6c3f77454b0fe3bdae24876c84616b1;p=libs%2Fgltk.git

diff --git a/source/entry.cpp b/source/entry.cpp
index 12eff06..43dad5e 100644
--- a/source/entry.cpp
+++ b/source/entry.cpp
@@ -28,7 +28,7 @@ Entry::Entry(const string &t):
 	set_text(t);
 }
 
-void Entry::autosize_special(const Part &part, Geometry &ageom)
+void Entry::autosize_special(const Part &part, Geometry &ageom) const
 {
 	if(part.get_name()=="text")
 	{
@@ -47,21 +47,7 @@ void Entry::autosize_special(const Part &part, Geometry &ageom)
 			ageom.h = max(ageom.h, line_height+margin.top+margin.bottom);
 	}
 	else if(part.get_name()=="slider" && multiline)
-	{
-		Geometry sgeom = part.get_geometry();
-		if(!sgeom.w || !sgeom.h)
-		{
-			slider->autosize();
-			if(!sgeom.w)
-				sgeom.w = slider->get_geometry().w;
-			if(!sgeom.h)
-				sgeom.h = slider->get_geometry().h;
-		}
-
-		const Sides &margin = part.get_margin();
-		ageom.w = max(ageom.w, sgeom.w+margin.left+margin.right);
-		ageom.h = max(ageom.h, sgeom.h+margin.top+margin.bottom);
-	}
+		autosize_child(*slider, part, ageom);
 }
 
 void Entry::set_text(const string &t)
@@ -93,7 +79,7 @@ void Entry::set_multiline(bool m)
 			add(*slider);
 			slider->set_step(1);
 			slider->signal_value_changed.connect(sigc::mem_fun(this, &Entry::slider_value_changed));
-			reposition_slider();
+			rebuild();
 		}
 		check_view_range();
 	}
@@ -102,7 +88,7 @@ void Entry::set_multiline(bool m)
 void Entry::rebuild_special(const Part &part)
 {
 	if(part.get_name()=="text")
-		text.build(part, geom, first_row, part_cache);
+		text.build(part, state, geom, first_row, part_cache);
 	else if(part.get_name()=="cursor")
 	{
 		const Graphic *graphic = part.get_graphic(state);
@@ -121,6 +107,14 @@ void Entry::rebuild_special(const Part &part)
 		bld.matrix() *= GL::Matrix::translation(rgeom.x, rgeom.y, 0);
 		graphic->build(part.get_geometry().w, part.get_geometry().h, bld);
 	}
+	else if(part.get_name()=="slider")
+	{
+		if(multiline)
+		{
+			reposition_child(*slider, part);
+			Widget::rebuild_special(part);
+		}
+	}
 	else
 		Widget::rebuild_special(part);
 }
@@ -131,7 +125,7 @@ void Entry::render_special(const Part &part, GL::Renderer &renderer) const
 		slider->render(renderer);
 }
 
-void Entry::key_press(unsigned key, unsigned)
+bool Entry::key_press(unsigned key, unsigned)
 {
 	got_key_press = true;
 	if(key==Input::KEY_LEFT)
@@ -176,16 +170,23 @@ void Entry::key_press(unsigned key, unsigned)
 		else
 			signal_enter.emit();
 	}
+	else
+		return false;
+
+	return true;
 }
 
-void Entry::character(wchar_t ch)
+bool Entry::character(wchar_t ch)
 {
 	if(got_key_press && ch>=' ')
 	{
 		text.insert(edit_pos, StringCodec::encode<StringCodec::Utf8>(StringCodec::ustring(1, ch)));
 		++edit_pos;
 		rebuild();
+		return true;
 	}
+
+	return false;
 }
 
 void Entry::focus_out()
@@ -196,8 +197,6 @@ void Entry::focus_out()
 
 void Entry::on_geometry_change()
 {
-	reposition_slider();
-
 	if(multiline)
 		check_view_range();
 }
@@ -214,8 +213,6 @@ void Entry::on_style_change()
 
 	text_part = style->get_part("text");
 
-	reposition_slider();
-
 	if(multiline)
 		check_view_range();
 }
@@ -227,28 +224,6 @@ void Entry::set_edit_position(unsigned ep)
 	rebuild();
 }
 
-void Entry::reposition_slider()
-{
-	if(!style || !slider)
-		return;
-
-	if(const Part *slider_part = style->get_part("slider"))
-	{
-		Geometry sgeom = slider_part->get_geometry();
-		if(!sgeom.w || !sgeom.h)
-		{
-			slider->autosize();
-			if(!sgeom.w)
-				sgeom.w = slider->get_geometry().w;
-			if(!sgeom.h)
-				sgeom.h = slider->get_geometry().h;
-		}
-
-		slider_part->get_alignment().apply(sgeom, geom, slider_part->get_margin());
-		slider->set_geometry(sgeom);
-	}
-}
-
 void Entry::check_view_range()
 {
 	if(!multiline || !text_part)