Implement next/previous navigation in Panel

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

diff --git a/source/panel.cpp b/source/panel.cpp
index dc2808ed4bf5a237d97aad9cd1ec75e068ac7580..97e13a2591b34dd9107f2dd65c22baa86750f676 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"
@@ -84,6 +84,9 @@ bool Panel::navigate(Navigation nav)
                        origin_dim = abs(nav_x)*geom.h+abs(nav_y)*geom.w;
                }
 
+               if(pointer_grabbed && pointer_focus==input_focus)
+                       return false;
+
                Widget *sibling = find_next_child(origin_x, origin_y, origin_dim, nav_x, nav_y);
                if(!sibling && input_focus)
                {
@@ -101,6 +104,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;
 }
@@ -156,6 +181,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);
@@ -165,6 +193,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);
@@ -178,27 +210,34 @@ Panel::Loader::Loader(Panel &p, map<string, Widget *> &m):
        wdg_map(m),
        last_widget(0)
 {
-       add("button",    &Loader::child<Button>);
+       add_child_type<Button>("button");
        add("column",    &Loader::arrangement<Column>);
        add("constraint",&Loader::constraint);
-       add("draghandle",&Loader::child<DragHandle>);
-       add("dropdown",  &Loader::child<Dropdown>);
-       add("entry",     &Loader::child<Entry>);
+       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("hslider",   &Loader::child<HSlider>);
-       add("image",     &Loader::child<Image>);
-       add("indicator", &Loader::child<Indicator>);
-       add("label",     &Loader::child<Label>);
+       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("list",      &Loader::child<List>);
-       add("panel",     &Loader::panel);
+       add_child_type<List>("list");
+       add_child_type<Panel>("panel");
        add("row",       &Loader::arrangement<Row>);
        add("stack",     &Loader::arrangement<Stack>);
-       add("toggle",    &Loader::child<Toggle>);
-       add("vslider",   &Loader::child<VSlider>);
+       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>);
 }
 
 Layout &Panel::Loader::get_layout()
@@ -228,10 +267,8 @@ void Panel::Loader::arrangement()
 template<typename T>
 void Panel::Loader::child(const string &n)
 {
-       RefPtr<T> chl = new T();
-       load_sub(*chl);
-       obj.add(*chl.get());
-       last_widget = wdg_map[n] = chl.release();
+       unnamed_child<T>();
+       wdg_map[n] = last_widget;
 }
 
 void Panel::Loader::constraint(Layout::ConstraintType type, const string &n)
@@ -269,14 +306,23 @@ void Panel::Loader::layout()
        load_sub_with(ldr);
 }
 
-void Panel::Loader::panel(const string &n)
+template<typename T>
+void Panel::Loader::unnamed_child()
 {
-       RefPtr<Panel> p = new Panel();
-       load_sub(*p, wdg_map);
-       obj.add(*p.get());
-       last_widget = wdg_map[n] = p.release();
+       RefPtr<T> chl = new T();
+       load_sub(*chl);
+       obj.add(*chl.get());
+       last_widget = chl.release();
 }
 
+template<>
+void Panel::Loader::unnamed_child<Panel>()
+{
+       RefPtr<Panel> pnl = new Panel();
+       load_sub(*pnl, wdg_map);
+       obj.add(*pnl.get());
+       last_widget = pnl.release();
+}
 
 template<typename T>
 Panel::ArrangedLoader<T>::ArrangedLoader(Loader &ldr, T &arr):