Move navigation logic from Container to Panel

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

diff --git a/source/panel.cpp b/source/panel.cpp
index c90c83b970d757dff2404331376ee777b09a2ef1..7e34c5947a7c7f4e0f93822eac08707c0ba3f104 100644 (file)
--- a/source/panel.cpp
+++ b/source/panel.cpp
@@ -3,16 +3,19 @@
 #include <msp/core/refptr.h>
 #include "button.h"
 #include "column.h"
+#include "draghandle.h"
 #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 "row.h"
+#include "stack.h"
 #include "toggle.h"
 #include "vslider.h"
 
@@ -23,7 +26,9 @@ namespace GLtk {
 
 Panel::Panel():
        layout(0)
-{ }
+{
+       input_type = INPUT_NAVIGATION;
+}
 
 Panel::~Panel()
 {
@@ -38,10 +43,10 @@ void Panel::set_layout(Layout *l)
        layout = l;
 }
 
-void Panel::autosize()
+void Panel::autosize_special(const Part &part, Geometry &ageom) const
 {
-       if(layout)
-               layout->autosize();
+       if(part.get_name()=="children" && layout)
+               layout->autosize(ageom);
 }
 
 void Panel::render_special(const Part &part, GL::Renderer &renderer) const
@@ -54,6 +59,70 @@ void Panel::render_special(const Part &part, GL::Renderer &renderer) const
        }
 }
 
+bool Panel::navigate(Navigation nav)
+{
+       if(Container::navigate(nav))
+               return true;
+
+       if(nav==NAV_UP || nav==NAV_DOWN || nav==NAV_LEFT || nav==NAV_RIGHT)
+       {
+               int x = geom.w/2;
+               int y = geom.h/2;
+               if(input_focus)
+               {
+                       const Geometry &fgeom = input_focus->get_geometry();
+                       x = fgeom.x+fgeom.w/2;
+                       y = fgeom.y+fgeom.h/2;
+               }
+               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)
+               {
+                       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;
+                       }
+               }
+
+               if(sibling)
+               {
+                       set_input_focus(sibling);
+                       if(Panel *panel = dynamic_cast<Panel *>(sibling))
+                               panel->navigate(nav);
+                       return true;
+               }
+       }
+
+       return false;
+}
+
 void Panel::on_geometry_change()
 {
        if(layout)
@@ -87,17 +156,22 @@ Panel::Loader::Loader(Panel &p, map<string, Widget *> &m):
        add("button",    &Loader::child<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("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>);
 }
@@ -147,6 +221,11 @@ void Panel::Loader::expand(bool h, bool v)
        get_layout().set_expand(get_last_widget(), h, v);
 }
 
+void Panel::Loader::ghost(bool g)
+{
+       get_layout().set_ghost(get_last_widget(), g);
+}
+
 void Panel::Loader::gravity(int h, int v)
 {
        get_layout().set_gravity(get_last_widget(), h, v);
@@ -159,6 +238,12 @@ void Panel::Loader::grid(unsigned cols)
        load_sub_with(ldr);
 }
 
+void Panel::Loader::layout()
+{
+       Layout::Loader ldr(get_layout(), wdg_map);
+       load_sub_with(ldr);
+}
+
 void Panel::Loader::panel(const string &n)
 {
        RefPtr<Panel> p = new Panel();