Rename Widget::on_geometry_change to on_size_change

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

diff --git a/source/dropdown.cpp b/source/dropdown.cpp
index e48303317b809601514ce71db7dded49dffbc068..f922001e2db0764c38000ec046bb9cd1c53150e4 100644 (file)
--- a/source/dropdown.cpp
+++ b/source/dropdown.cpp
@@ -25,12 +25,15 @@ Dropdown::Dropdown(ListData &d):
 
 void Dropdown::init()
 {
+       input_type = INPUT_NAVIGATION;
+
        dropped = false;
 
        add(list);
        list.set_visible(false);
        list.set_view_all();
        list.signal_item_selected.connect(sigc::mem_fun(this, &Dropdown::list_item_selected));
+       list.signal_selection_cleared.connect(sigc::mem_fun(this, &Dropdown::list_selection_cleared));
        list.signal_autosize_changed.connect(sigc::mem_fun(this, &Dropdown::list_autosize_changed));
 }
 
@@ -62,13 +65,6 @@ void Dropdown::autosize_special(const Part &part, Geometry &ageom) const
        }
 }
 
-void Dropdown::set_selected_index(int index)
-{
-       list.set_selected_index(index);
-       if(index<0)
-               text.set(string());
-}
-
 void Dropdown::rebuild_special(const Part &part)
 {
        if(part.get_name()=="text")
@@ -89,24 +85,30 @@ void Dropdown::button_press(int x, int y, unsigned btn)
        {
                Container::button_press(x, y, btn);
                if(!click_focus)
-               {
-                       dropped = false;
-                       list.set_visible(false);
-                       clear_state(ACTIVE);
-                       signal_ungrab_pointer.emit();
-               }
+                       close_list();
        }
        else if(btn==1)
+               open_list();
+}
+
+bool Dropdown::navigate(Navigation nav)
+{
+       if(dropped)
        {
-               dropped = true;
-               list.set_visible(true);
-               resize_list();
-               set_state(ACTIVE);
-               signal_grab_pointer.emit();
+               if(nav==NAV_CANCEL)
+                       close_list();
+               else
+                       list.navigate(nav);
        }
+       else if(nav==NAV_ACTIVATE)
+               open_list();
+       else
+               return false;
+
+       return true;
 }
 
-void Dropdown::on_geometry_change()
+void Dropdown::on_size_change()
 {
        if(dropped)
                resize_list();
@@ -119,6 +121,24 @@ void Dropdown::on_style_change()
                resize_list();
 }
 
+void Dropdown::open_list()
+{
+       dropped = true;
+       list.set_visible(true);
+       resize_list();
+       set_state(ACTIVE);
+       set_input_focus(&list);
+       signal_grab_pointer.emit();
+}
+
+void Dropdown::close_list()
+{
+       dropped = false;
+       list.set_visible(false);
+       clear_state(ACTIVE);
+       signal_ungrab_pointer.emit();
+}
+
 void Dropdown::list_autosize_changed()
 {
        if(dropped)
@@ -174,6 +194,11 @@ void Dropdown::list_item_selected(unsigned index)
        rebuild();
 }
 
+void Dropdown::list_selection_cleared()
+{
+       text.set(string());
+}
+
 
 Dropdown::Loader::Loader(Dropdown &d):
        DataFile::DerivedObjectLoader<Dropdown, Widget::Loader>(d)