X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fentry.cpp;h=2dc046646e49af2af9b07967a090e42f041f0c64;hb=43ac7c4514658754d09552463425bcd344fb9ded;hp=271c49a4b6cda21ca063f9e7e7339ea460c96de5;hpb=73afd124ab87e8bace98db55517a56c797a9b8c7;p=libs%2Fgltk.git

diff --git a/source/entry.cpp b/source/entry.cpp
index 271c49a..2dc0466 100644
--- a/source/entry.cpp
+++ b/source/entry.cpp
@@ -32,6 +32,55 @@ Entry::Entry(const string &t):
 	set_text(t);
 }
 
+void Entry::autosize()
+{
+	if(!style)
+		return;
+
+	Widget::autosize();
+
+	if(text_part)
+	{
+		const Sides &margin = text_part->get_margin();
+		const GL::Font &font = *style->get_font();
+		unsigned en_width = static_cast<unsigned>(font.get_string_width("n")*font.get_native_size());
+		geom.w = max(geom.w, 10*en_width+margin.left+margin.right);
+
+		unsigned line_height = static_cast<unsigned>((font.get_ascent()-font.get_descent())*font.get_native_size());
+		if(multiline)
+		{
+			unsigned line_spacing = font.get_native_size()*6/5;
+			geom.h = max(geom.h, line_height+line_spacing*2+margin.top+margin.bottom);
+		}
+		else
+			geom.h = max(geom.h, line_height+margin.top+margin.bottom);
+	}
+
+	if(multiline)
+	{
+		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;
+			}
+
+			const Sides &margin = slider_part->get_margin();
+			geom.w = max(geom.w, sgeom.w+margin.left+margin.right);
+			geom.h = max(geom.h, sgeom.h+margin.top+margin.bottom);
+
+			reposition_slider();
+		}
+
+		check_view_range();
+	}
+}
+
 void Entry::set_text(const string &t)
 {
 	text = t;
@@ -180,6 +229,15 @@ void Entry::reposition_slider()
 	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);
 	}