Make the List in Dropdown a normal member instead of pointer

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

diff --git a/source/dropdown.cpp b/source/dropdown.cpp
index 5d8a547bebae925083fb40222e8dde20f8178ab2..a4816d48d593bb430e8b1aa764c35aac131b5744 100644 (file)
--- a/source/dropdown.cpp
+++ b/source/dropdown.cpp
@@ -5,10 +5,12 @@ Copyright © 2007  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
+#include <msp/gl/font.h>
 #include "dropdown.h"
 #include "list.h"
 #include "panel.h"
 #include "part.h"
+#include "style.h"
 
 using namespace std;
 
@@ -17,61 +19,69 @@ namespace GLtk {
 
 Dropdown::Dropdown(const Resources &r):
        Widget(r),
-       list(new List(res)),
+       list(r),
        dropped(false),
        list_active(false)
 {
-       list->signal_item_selected.connect(sigc::mem_fun(this, &Dropdown::list_item_selected));
+       list.signal_item_selected.connect(sigc::mem_fun(this, &Dropdown::list_item_selected));
 
        update_style();
 }
 
 Dropdown::~Dropdown()
 {
-       delete list;
 }
 
 void Dropdown::append(const string &item)
 {
-       list->append(item);
+       list.append(item);
+       resize_list();
 }
 
 void Dropdown::insert(unsigned i, const string &v)
 {
-       list->insert(i, v);
+       list.insert(i, v);
+       resize_list();
 }
 
 void Dropdown::remove(unsigned i)
 {
-       list->remove(i);
+       list.remove(i);
+       resize_list();
 }
 
 void Dropdown::clear()
 {
-       list->clear();
+       list.clear();
+       resize_list();
+}
+
+unsigned Dropdown::get_n_items() const
+{
+       return list.get_n_items();
 }
 
 void Dropdown::set_selected_index(int i)
 {
-       list->set_selected_index(i);
+       list.set_selected_index(i);
 }
 
 const string &Dropdown::get_selected() const
 {
-       return list->get_selected();
+       return list.get_selected();
 }
 
 int Dropdown::get_selected_index() const
 {
-       return list->get_selected_index();
+       return list.get_selected_index();
 }
 
 void Dropdown::button_press(int x, int y, unsigned btn)
 {
-       if(list->get_geometry().is_inside(x, y))
+       if(list.get_geometry().is_inside(x, y))
        {
-               const Geometry &lgeom=list->get_geometry();
-               list->button_press(x-lgeom.x, y-lgeom.y, btn);
+               const Geometry &lgeom=list.get_geometry();
+               list.button_press(x-lgeom.x, y-lgeom.y, btn);
                list_active=true;
        }
        else if(dropped)
@@ -97,8 +107,8 @@ void Dropdown::button_release(int x, int y, unsigned btn)
 {
        if(list_active)
        {
-               const Geometry &lgeom=list->get_geometry();
-               list->button_release(x-lgeom.x, y-lgeom.y, btn);
+               const Geometry &lgeom=list.get_geometry();
+               list.button_release(x-lgeom.x, y-lgeom.y, btn);
                list_active=false;
        }
 }
@@ -107,8 +117,8 @@ void Dropdown::pointer_motion(int x, int y)
 {
        if(list_active)
        {
-               const Geometry &lgeom=list->get_geometry();
-               list->pointer_motion(x-lgeom.x, y-lgeom.y);
+               const Geometry &lgeom=list.get_geometry();
+               list.pointer_motion(x-lgeom.x, y-lgeom.y);
        }
 }
 
@@ -116,16 +126,32 @@ void Dropdown::render_special(const Part &part) const
 {
        if(part.get_name()=="text")
        {
-               if(list->get_selected_index()>=0)
-                       render_text(part, list->get_selected());
+               if(list.get_selected_index()>=0)
+                       render_text(part, list.get_selected());
        }
        else if(part.get_name()=="list" && dropped)
-               list->render();
+               list.render();
 }
 
 void Dropdown::on_geometry_change()
 {
-       list->set_geometry(Geometry(0, -100, geom.w, 100));
+       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), 20U)*static_cast<unsigned>((font.get_ascent()-font.get_descent())*font.get_default_size());
+       for(std::list<Part>::const_iterator i=stl.get_parts().begin(); i!=stl.get_parts().end(); ++i)
+               if(i->get_name()=="items")
+               {
+                       const Sides &margin=i->get_margin();
+                       h+=margin.top+margin.bottom;
+               }
+       list.set_geometry(Geometry(0, -h, geom.w, h));
 }
 
 void Dropdown::list_item_selected(unsigned index, const std::string &item)