Simplify constructors with C++11

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

diff --git a/source/panel.cpp b/source/panel.cpp
index dc2808ed4bf5a237d97aad9cd1ec75e068ac7580..871d7a2d9ebffb211d1bdc3f389a4fd6374e31e6 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,25 +7,27 @@
 #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 {
 
-Panel::Panel():
-       layout(0)
+TypeRegistry<Panel::Loader::AddChildType, Panel::Loader &> Panel::widget_registry;
+bool Panel::widget_registry_init_done = false;
+
+Panel::Panel()
 {
        input_type = INPUT_NAVIGATION;
 }
@@ -53,9 +55,9 @@ void Panel::render_special(const Part &part, GL::Renderer &renderer) const
 {
        if(part.get_name()=="children")
        {
-               for(list<Container::Child *>::const_iterator i=children.begin(); i!=children.end(); ++i)
-                       if((*i)->widget->is_visible())
-                               (*i)->widget->render(renderer);
+               for(const Container::Child *c: children)
+                       if(c->widget->is_visible())
+                               c->widget->render(renderer);
        }
 }
 
@@ -84,6 +86,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 +106,28 @@ bool Panel::navigate(Navigation nav)
                        return true;
                }
        }
+       else if(nav==NAV_NEXT || nav==NAV_PREVIOUS)
+       {
+               auto 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;
 }
@@ -109,12 +136,12 @@ Widget *Panel::find_next_child(int origin_x, int origin_y, int origin_dim, int n
 {
        Widget *sibling = 0;
        int best_score = 0;
-       for(list<Child *>::const_iterator i=children.begin(); i!=children.end(); ++i)
+       for(const Child *c: children)
        {
-               if((*i)->widget==input_focus || !(*i)->widget->is_focusable())
+               if(c->widget==input_focus || !c->widget->is_focusable())
                        continue;
 
-               const Geometry &cgeom = (*i)->widget->get_geometry();
+               const Geometry &cgeom = c->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);
 
@@ -126,7 +153,7 @@ Widget *Panel::find_next_child(int origin_x, int origin_y, int origin_dim, int n
 
                if(score>=0 && (!sibling || score<best_score))
                {
-                       sibling = (*i)->widget;
+                       sibling = c->widget;
                        best_score = score;
                }
        }
@@ -148,7 +175,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();
@@ -156,6 +183,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 +195,10 @@ void Panel::on_child_added(Widget &wdg)
 
 void Panel::on_child_removed(Widget &wdg)
 {
+       auto 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 +212,34 @@ 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<ProgressBar>("progressbar");
+               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.invoke_all(*this);
 }
 
 Layout &Panel::Loader::get_layout()
@@ -225,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();
@@ -269,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();
 }