X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdropdown.cpp;h=013e1d9168721d794bcd4069f7d596fe2fb7ee36;hb=707b59d45ae50b69c94918f8f74313283b304597;hp=ddf5c9268500479655796caecf9bad0a1ec71e20;hpb=319cde3c06181ba1c3619567525002926d8b4889;p=libs%2Fgltk.git

diff --git a/source/dropdown.cpp b/source/dropdown.cpp
index ddf5c92..013e1d9 100644
--- a/source/dropdown.cpp
+++ b/source/dropdown.cpp
@@ -28,22 +28,22 @@ void Dropdown::init()
 	dropped = false;
 
 	add(list);
+	list.set_view_all();
 	list.signal_item_selected.connect(sigc::mem_fun(this, &Dropdown::list_item_selected));
 	list.signal_autosize_changed.connect(sigc::mem_fun(this, &Dropdown::list_autosize_changed));
 }
 
-void Dropdown::autosize()
+void Dropdown::autosize_special(const Part &part, Geometry &ageom) const
 {
-	if(!style)
-		return;
-
-	Widget::autosize();
-	list.autosize_all();
-	geom.w = max(geom.w, list.get_geometry().w);
-
-	if(const Part *text_part = style->get_part("text"))
+	if(part.get_name()=="list")
+	{
+		Geometry lgeom;
+		list.autosize(lgeom);
+		ageom.w = max(ageom.w, list.get_geometry().w);
+	}
+	else if(part.get_name()=="text")
 	{
-		const Sides &margin = text_part->get_margin();
+		const Sides &margin = part.get_margin();
 		const GL::Font &font = style->get_font();
 		float font_size = style->get_font_size();
 
@@ -54,13 +54,11 @@ void Dropdown::autosize()
 			unsigned w = static_cast<unsigned>(font.get_string_width(data.get_string(i))*font_size);
 			max_w = max(max_w, w);
 		}
-		geom.w = max(geom.w, max_w+margin.left+margin.right);
+		ageom.w = max(ageom.w, max_w+margin.left+margin.right);
 
 		unsigned line_height = static_cast<unsigned>((font.get_ascent()-font.get_descent())*font_size);
-		geom.h = max(geom.h, line_height+margin.top+margin.bottom);
+		ageom.h = max(ageom.h, line_height+margin.top+margin.bottom);
 	}
-
-	rebuild();
 }
 
 void Dropdown::set_selected_index(int index)
@@ -73,7 +71,7 @@ void Dropdown::set_selected_index(int index)
 void Dropdown::rebuild_special(const Part &part)
 {
 	if(part.get_name()=="text")
-		text.build(part, geom, part_cache);
+		text.build(part, state, geom, part_cache);
 	else
 		Widget::rebuild_special(part);
 }
@@ -123,7 +121,7 @@ void Dropdown::list_autosize_changed()
 
 void Dropdown::resize_list()
 {
-	list.autosize_all();
+	list.autosize();
 	Geometry lgeom = list.get_geometry();
 	lgeom.x = 0;
 	lgeom.y = -lgeom.h;