Store the Resources reference only in Root widget

[libs/gltk.git] / source / dropdown.cpp

diff --git a/source/dropdown.cpp b/source/dropdown.cpp
index 5901414f3a033a9ad786a537d70e93163840da4e..bcd501950a08aee01f584c925725717c5b83223b 100644 (file)
--- a/source/dropdown.cpp
+++ b/source/dropdown.cpp
@@ -18,16 +18,11 @@ using namespace std;
 namespace Msp {
 namespace GLtk {
 
-Dropdown::Dropdown(const Resources &r):
-       Widget(r),
-       Container(r),
-       list(r),
+Dropdown::Dropdown():
        dropped(false)
 {
        add(list);
        list.signal_item_selected.connect(sigc::mem_fun(this, &Dropdown::list_item_selected));
-
-       update_style();
 }
 
 void Dropdown::append(const string &item)
@@ -110,19 +105,16 @@ void Dropdown::on_geometry_change()
        resize_list();
 }
 
+void Dropdown::on_style_change()
+{
+       resize_list();
+}
+
 void Dropdown::resize_list()
 {
-       // XXX This is a hack.
-       unsigned n_items = list.get_n_items();
-       const Style &stl = list.get_style();
-       const GL::Font &font = *stl.get_font();
-       unsigned h = min(max(n_items, 1U), 10U)*static_cast<unsigned>((font.get_ascent()-font.get_descent())*font.get_default_size());
-       if(const Part *items_part = stl.get_part("items"))
-       {
-               const Sides &margin = items_part->get_margin();
-               h += margin.top+margin.bottom;
-       }
-       list.set_geometry(Geometry(0, -h, geom.w, h));
+       list.autosize();
+       const Geometry &lgeom = list.get_geometry();
+       list.set_geometry(Geometry(0, -lgeom.h, max(geom.w, lgeom.w), lgeom.h));
 }
 
 void Dropdown::list_item_selected(unsigned index, const std::string &item)