X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fentry.cpp;h=cee23b02372904317419fc294a17f783fa457589;hb=1afb4f8d6379ad1bf832692fbfedef9714ee3ff5;hp=1198bdee52b34d3e2057232e8b12e4c65c6791a7;hpb=707b59d45ae50b69c94918f8f74313283b304597;p=libs%2Fgltk.git

diff --git a/source/entry.cpp b/source/entry.cpp
index 1198bde..cee23b0 100644
--- a/source/entry.cpp
+++ b/source/entry.cpp
@@ -47,21 +47,7 @@ void Entry::autosize_special(const Part &part, Geometry &ageom) const
 			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();
 	}
@@ -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);
 }
@@ -196,8 +190,6 @@ void Entry::focus_out()
 
 void Entry::on_geometry_change()
 {
-	reposition_slider();
-
 	if(multiline)
 		check_view_range();
 }
@@ -214,8 +206,6 @@ void Entry::on_style_change()
 
 	text_part = style->get_part("text");
 
-	reposition_slider();
-
 	if(multiline)
 		check_view_range();
 }
@@ -227,28 +217,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)