]> git.tdb.fi Git - libs/gltk.git/blobdiff - source/panel.cpp
Rewrite Panel navigation logic so it makes more sense
[libs/gltk.git] / source / panel.cpp
index 9bc752413c84b3952feb43f76dc13758d4dd1118..dc2808ed4bf5a237d97aad9cd1ec75e068ac7580 100644 (file)
@@ -1,15 +1,21 @@
 #include <algorithm>
+#include <msp/core/maputils.h>
 #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 "layout.h"
 #include "list.h"
 #include "panel.h"
 #include "part.h"
+#include "row.h"
+#include "stack.h"
 #include "toggle.h"
 #include "vslider.h"
 
@@ -20,7 +26,9 @@ namespace GLtk {
 
 Panel::Panel():
        layout(0)
-{ }
+{
+       input_type = INPUT_NAVIGATION;
+}
 
 Panel::~Panel()
 {
@@ -35,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
@@ -51,6 +59,95 @@ 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 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();
+                       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
+               {
+                       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;
+               }
+
+               Widget *sibling = find_next_child(origin_x, origin_y, origin_dim, nav_x, nav_y);
+               if(!sibling && input_focus)
+               {
+                       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)
+               {
+                       set_input_focus(sibling);
+                       if(Panel *panel = dynamic_cast<Panel *>(sibling))
+                               panel->navigate(nav);
+                       return true;
+               }
+       }
+
+       return false;
+}
+
+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_geometry_change()
 {
        if(layout)
@@ -78,27 +175,98 @@ void Panel::on_child_removed(Widget &wdg)
 
 Panel::Loader::Loader(Panel &p, map<string, Widget *> &m):
        DataFile::DerivedObjectLoader<Panel, Widget::Loader>(p),
-       wdg_map(m)
+       wdg_map(m),
+       last_widget(0)
 {
        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>);
 }
 
+Layout &Panel::Loader::get_layout()
+{
+       if(!obj.layout)
+               obj.set_layout(new Layout);
+
+       return *obj.layout;
+}
+
+Widget &Panel::Loader::get_last_widget()
+{
+       if(!last_widget)
+               throw logic_error("no widget loaded");
+
+       return *last_widget;
+}
+
+template<typename T>
+void Panel::Loader::arrangement()
+{
+       T arr(get_layout());
+       ArrangedLoader<T> ldr(*this, arr);
+       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());
-       wdg_map[n] = chl.release();
+       last_widget = wdg_map[n] = chl.release();
+}
+
+void Panel::Loader::constraint(Layout::ConstraintType type, const string &n)
+{
+       Widget &src = get_last_widget();
+       Widget &tgt = *get_item(wdg_map, n);
+       get_layout().add_constraint(src, type, tgt);
+}
+
+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);
+}
+
+void Panel::Loader::grid(unsigned cols)
+{
+       Grid grd(get_layout(), cols);
+       ArrangedLoader<Grid> ldr(*this, grd);
+       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)
@@ -106,7 +274,16 @@ void Panel::Loader::panel(const string &n)
        RefPtr<Panel> p = new Panel();
        load_sub(*p, wdg_map);
        obj.add(*p.get());
-       wdg_map[n] = p.release();
+       last_widget = wdg_map[n] = p.release();
+}
+
+
+template<typename T>
+Panel::ArrangedLoader<T>::ArrangedLoader(Loader &ldr, T &arr):
+       arr_loader(arr)
+{
+       add_auxiliary_loader(ldr);
+       add_auxiliary_loader(arr_loader);
 }
 
 } // namespace GLtk