]> git.tdb.fi Git - libs/gltk.git/blobdiff - source/panel.cpp
Rename Widget::on_geometry_change to on_size_change
[libs/gltk.git] / source / panel.cpp
index 7e34c5947a7c7f4e0f93822eac08707c0ba3f104..c97cd6d7212da9c648cbed683edf23dad4250701 100644 (file)
@@ -1,4 +1,4 @@
-#include <algorithm>
+#include <msp/core/algorithm.h>
 #include <msp/core/maputils.h>
 #include <msp/core/refptr.h>
 #include "button.h"
@@ -24,6 +24,9 @@ using namespace std;
 namespace Msp {
 namespace GLtk {
 
+DataFile::LoadableTypeRegistry<Panel::Loader, Panel::Loader::AddChildType> Panel::widget_registry;
+bool Panel::widget_registry_init_done = false;
+
 Panel::Panel():
        layout(0)
 {
@@ -66,49 +69,34 @@ bool Panel::navigate(Navigation nav)
 
        if(nav==NAV_UP || nav==NAV_DOWN || nav==NAV_LEFT || nav==NAV_RIGHT)
        {
-               int x = geom.w/2;
-               int y = geom.h/2;
+               int nav_x = (nav==NAV_RIGHT ? 1 : nav==NAV_LEFT ? -1 : 0);
+               int nav_y = (nav==NAV_UP ? 1 : nav==NAV_DOWN ? -1 : 0);
+
+               int origin_x, origin_y, origin_dim;
                if(input_focus)
                {
                        const Geometry &fgeom = input_focus->get_geometry();
-                       x = fgeom.x+fgeom.w/2;
-                       y = fgeom.y+fgeom.h/2;
+                       origin_x = fgeom.x+(nav_x*0.5+0.5)*fgeom.w;
+                       origin_y = fgeom.y+(nav_y*0.5+0.5)*fgeom.h;
+                       origin_dim = abs(nav_x)*fgeom.h+abs(nav_y)*fgeom.w;
                }
-               else if(nav==NAV_UP)
-                       y = 0;
-               else if(nav==NAV_DOWN)
-                       y = geom.h;
-               else if(nav==NAV_RIGHT)
-                       x = 0;
-               else if(nav==NAV_LEFT)
-                       x = geom.w;
-
-               Widget *sibling = 0;
-               int best_score = 0;
-               for(list<Child *>::const_iterator i=children.begin(); i!=children.end(); ++i)
+               else
+               {
+                       origin_x = geom.w*(0.5-nav_x*0.5);
+                       origin_y = geom.h*(0.5-nav_y*0.5);
+                       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)
                {
-                       if((*i)->widget==input_focus || !(*i)->widget->is_focusable())
-                               continue;
-
-                       const Geometry &cgeom = (*i)->widget->get_geometry();
-                       int dx = cgeom.x+cgeom.w/2-x;
-                       int dy = cgeom.y+cgeom.h/2-y;
-
-                       int score = -1;
-                       if(nav==NAV_UP && dy>0)
-                               score = dy+abs(dx)*4;
-                       else if(nav==NAV_DOWN && dy<0)
-                               score = -dy+abs(dx)*4;
-                       else if(nav==NAV_RIGHT && dx>0)
-                               score = dx+abs(dy)*4;
-                       else if(nav==NAV_LEFT && dx<0)
-                               score = -dx+abs(dy)*4;
-
-                       if(score>0 && (!sibling || score<best_score))
-                       {
-                               sibling = (*i)->widget;
-                               best_score = score;
-                       }
+                       const Geometry &fgeom = input_focus->get_geometry();
+                       origin_x -= fgeom.w*(nav_x*0.5);
+                       origin_y -= fgeom.h*(nav_y*0.5);
+                       sibling = find_next_child(origin_x, origin_y, origin_dim, nav_x, nav_y);
                }
 
                if(sibling)
@@ -119,11 +107,76 @@ 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;
 }
 
-void Panel::on_geometry_change()
+Widget *Panel::find_next_child(int origin_x, int origin_y, int origin_dim, int nav_x, int nav_y) const
+{
+       Widget *sibling = 0;
+       int best_score = 0;
+       for(list<Child *>::const_iterator i=children.begin(); i!=children.end(); ++i)
+       {
+               if((*i)->widget==input_focus || !(*i)->widget->is_focusable())
+                       continue;
+
+               const Geometry &cgeom = (*i)->widget->get_geometry();
+               int dx = compute_delta(cgeom.x, cgeom.w, origin_x, origin_dim, nav_x);
+               int dy = compute_delta(cgeom.y, cgeom.h, origin_y, origin_dim, nav_y);
+
+               int score = -1;
+               if(nav_y && nav_y*dy>=0)
+                       score = nav_y*dy+abs(dx)*4;
+               else if(nav_x && nav_x*dx>=0)
+                       score = nav_x*dx+abs(dy)*4;
+
+               if(score>=0 && (!sibling || score<best_score))
+               {
+                       sibling = (*i)->widget;
+                       best_score = score;
+               }
+       }
+
+       return sibling;
+}
+
+int Panel::compute_delta(int pos, int dim, int origin_pos, int origin_dim, int nav)
+{
+       if(nav<0)
+               return pos+dim-origin_pos;
+       else if(nav>0)
+               return pos-origin_pos;
+       else if(pos+dim<origin_pos-origin_dim/2)
+               return pos+dim+origin_dim/2-origin_pos;
+       else if(pos>origin_pos+origin_dim/2)
+               return pos-origin_pos-origin_dim/2;
+       else
+               return 0;
+}
+
+void Panel::on_size_change()
 {
        if(layout)
                layout->update();
@@ -131,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);
@@ -140,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);
@@ -153,27 +213,33 @@ Panel::Loader::Loader(Panel &p, map<string, Widget *> &m):
        wdg_map(m),
        last_widget(0)
 {
-       add("button",    &Loader::child<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<Toggle>("toggle");
+               register_child_type<VSlider>("vslider");
+       }
+
        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("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("layout",    &Loader::layout);
-       add("list",      &Loader::child<List>);
-       add("panel",     &Loader::panel);
        add("row",       &Loader::arrangement<Row>);
        add("stack",     &Loader::arrangement<Stack>);
-       add("toggle",    &Loader::child<Toggle>);
-       add("vslider",   &Loader::child<VSlider>);
+       widget_registry.add_all(*this);
 }
 
 Layout &Panel::Loader::get_layout()
@@ -200,15 +266,6 @@ void Panel::Loader::arrangement()
        load_sub_with(ldr);
 }
 
-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();
-}
-
 void Panel::Loader::constraint(Layout::ConstraintType type, const string &n)
 {
        Widget &src = get_last_widget();
@@ -244,12 +301,13 @@ void Panel::Loader::layout()
        load_sub_with(ldr);
 }
 
-void Panel::Loader::panel(const string &n)
+template<>
+void Panel::Loader::unnamed_child<Panel>()
 {
-       RefPtr<Panel> p = new Panel();
-       load_sub(*p, wdg_map);
-       obj.add(*p.get());
-       last_widget = wdg_map[n] = p.release();
+       RefPtr<Panel> pnl = new Panel();
+       load_sub(*pnl, wdg_map);
+       obj.add(*pnl.get());
+       last_widget = pnl.release();
 }