Adjust things to conform to changes in other libraries

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

diff --git a/source/panel.cpp b/source/panel.cpp
index a9d581f5aae63a11150df2b2fd3ebcba81d6f624..957385e0dbb82ae14c586e045a9c5ac1e0aa7cad 100644 (file)
--- a/source/panel.cpp
+++ b/source/panel.cpp
@@ -1,4 +1,4 @@
-#include <algorithm>
+#include <msp/core/algorithm.h>
 #include <msp/core/maputils.h>
 #include <msp/core/refptr.h>
 #include "button.h"
@@ -7,23 +7,26 @@
 #include "dropdown.h"
 #include "entry.h"
 #include "grid.h"
-#include "hslider.h"
 #include "image.h"
 #include "indicator.h"
 #include "label.h"
 #include "list.h"
 #include "panel.h"
 #include "part.h"
+#include "progressbar.h"
 #include "row.h"
+#include "slider.h"
 #include "stack.h"
 #include "toggle.h"
-#include "vslider.h"
 
 using namespace std;
 
 namespace Msp {
 namespace GLtk {
 
+TypeRegistry<Panel::Loader::AddChildType, Panel::Loader &> Panel::widget_registry;
+bool Panel::widget_registry_init_done = false;
+
 Panel::Panel():
        layout(0)
 {
@@ -104,6 +107,28 @@ bool Panel::navigate(Navigation nav)
                        return true;
                }
        }
+       else if(nav==NAV_NEXT || nav==NAV_PREVIOUS)
+       {
+               vector<Widget *>::iterator i = find(nav_order, input_focus);
+
+               if(nav==NAV_NEXT)
+               {
+                       if(i!=nav_order.end())
+                               ++i;
+                       if(i==nav_order.end())
+                               i = nav_order.begin();
+               }
+               else
+               {
+                       if(i==nav_order.begin())
+                               i = nav_order.end();
+                       --i;
+               }
+
+               set_input_focus(*i);
+
+               return true;
+       }
 
        return false;
 }
@@ -151,7 +176,7 @@ int Panel::compute_delta(int pos, int dim, int origin_pos, int origin_dim, int n
                return 0;
 }
 
-void Panel::on_geometry_change()
+void Panel::on_size_change()
 {
        if(layout)
                layout->update();
@@ -159,6 +184,9 @@ void Panel::on_geometry_change()
 
 void Panel::on_child_added(Widget &wdg)
 {
+       if(wdg.get_input_type()!=INPUT_NONE)
+               nav_order.push_back(&wdg);
+
        if(layout)
        {
                layout->add_widget(wdg);
@@ -168,6 +196,10 @@ void Panel::on_child_added(Widget &wdg)
 
 void Panel::on_child_removed(Widget &wdg)
 {
+       vector<Widget *>::iterator i = std::remove(nav_order.begin(), nav_order.end(), &wdg);
+       if(i!=nav_order.end())
+               nav_order.erase(i, nav_order.end());
+
        if(layout)
        {
                layout->remove_widget(wdg);
@@ -181,34 +213,34 @@ Panel::Loader::Loader(Panel &p, map<string, Widget *> &m):
        wdg_map(m),
        last_widget(0)
 {
-       add_child_type<Button>("button");
+       if(!widget_registry_init_done)
+       {
+               widget_registry_init_done = true;
+               register_child_type<Button>("button");
+               register_child_type<DragHandle>("draghandle");
+               register_child_type<Dropdown>("dropdown");
+               register_child_type<Entry>("entry");
+               register_child_type<HSlider>("hslider");
+               register_child_type<Image>("image");
+               register_child_type<Indicator>("indicator");
+               register_child_type<Label>("label");
+               register_child_type<List>("list");
+               register_child_type<Panel>("panel");
+               register_child_type<ProgressBar>("progressbar");
+               register_child_type<Toggle>("toggle");
+               register_child_type<VSlider>("vslider");
+       }
+
        add("column",    &Loader::arrangement<Column>);
        add("constraint",&Loader::constraint);
-       add_child_type<DragHandle>("draghandle");
-       add_child_type<Dropdown>("dropdown");
-       add_child_type<Entry>("entry");
        add("expand",    &Loader::expand);
        add("ghost",     &Loader::ghost);
        add("gravity",   &Loader::gravity);
        add("grid",      &Loader::grid);
-       add_child_type<HSlider>("hslider");
-       add_child_type<Image>("image");
-       add_child_type<Indicator>("indicator");
-       add_child_type<Label>("label");
        add("layout",    &Loader::layout);
-       add_child_type<List>("list");
-       add_child_type<Panel>("panel");
        add("row",       &Loader::arrangement<Row>);
        add("stack",     &Loader::arrangement<Stack>);
-       add_child_type<Toggle>("toggle");
-       add_child_type<VSlider>("vslider");
-}
-
-template<typename T>
-void Panel::Loader::add_child_type(const string &keyword)
-{
-       add(keyword, &Loader::child<T>);
-       add(keyword, &Loader::unnamed_child<T>);
+       widget_registry.invoke_all(*this);
 }
 
 Layout &Panel::Loader::get_layout()
@@ -235,13 +267,6 @@ void Panel::Loader::arrangement()
        load_sub_with(ldr);
 }
 
-template<typename T>
-void Panel::Loader::child(const string &n)
-{
-       unnamed_child<T>();
-       wdg_map[n] = last_widget;
-}
-
 void Panel::Loader::constraint(Layout::ConstraintType type, const string &n)
 {
        Widget &src = get_last_widget();
@@ -277,15 +302,6 @@ void Panel::Loader::layout()
        load_sub_with(ldr);
 }
 
-template<typename T>
-void Panel::Loader::unnamed_child()
-{
-       RefPtr<T> chl = new T();
-       load_sub(*chl);
-       obj.add(*chl.get());
-       last_widget = chl.release();
-}
-
 template<>
 void Panel::Loader::unnamed_child<Panel>()
 {
@@ -295,6 +311,7 @@ void Panel::Loader::unnamed_child<Panel>()
        last_widget = pnl.release();
 }
 
+
 template<typename T>
 Panel::ArrangedLoader<T>::ArrangedLoader(Loader &ldr, T &arr):
        arr_loader(arr)