-#include <algorithm>
+#include <msp/core/algorithm.h>
#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 "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;
}
-Panel::~Panel()
+Layout &Panel::get_or_create_layout()
{
- delete layout;
- layout = 0;
-}
+ if(!layout)
+ {
+ layout = make_unique<Layout>();
+ layout->set_container(*this);
+ }
-void Panel::set_layout(Layout *l)
-{
- l->set_container(*this);
- delete layout;
- layout = l;
+ return *layout;
}
void Panel::autosize_special(const Part &part, Geometry &ageom) 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 unique_ptr<Child> &c: children)
+ if(c->widget->is_visible())
+ c->widget->render(renderer);
}
}
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)
{
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;
}
Widget *Panel::find_next_child(int origin_x, int origin_y, int origin_dim, int nav_x, int nav_y) const
{
- Widget *sibling = 0;
+ Widget *sibling = nullptr;
int best_score = 0;
- for(list<Child *>::const_iterator i=children.begin(); i!=children.end(); ++i)
+ for(const unique_ptr<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);
if(score>=0 && (!sibling || score<best_score))
{
- sibling = (*i)->widget;
+ sibling = c->widget;
best_score = score;
}
}
return 0;
}
-void Panel::on_geometry_change()
+void Panel::on_size_change()
{
if(layout)
layout->update();
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);
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);
Panel::Loader::Loader(Panel &p, map<string, Widget *> &m):
DataFile::DerivedObjectLoader<Panel, Widget::Loader>(p),
wdg_map(m),
- last_widget(0)
+ last_widget(nullptr)
{
- 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>);
-}
-
-Layout &Panel::Loader::get_layout()
-{
- if(!obj.layout)
- obj.set_layout(new Layout);
-
- return *obj.layout;
+ widget_registry.invoke_all(*this);
}
Widget &Panel::Loader::get_last_widget()
template<typename T>
void Panel::Loader::arrangement()
{
- T arr(get_layout());
+ T arr(obj.get_or_create_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());
- 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);
+ obj.get_or_create_layout().add_constraint(src, type, tgt);
}
void Panel::Loader::expand(bool h, bool v)
{
- get_layout().set_expand(get_last_widget(), h, v);
+ obj.get_or_create_layout().set_expand(get_last_widget(), h, v);
}
void Panel::Loader::ghost(bool g)
{
- get_layout().set_ghost(get_last_widget(), g);
+ obj.get_or_create_layout().set_ghost(get_last_widget(), g);
}
void Panel::Loader::gravity(int h, int v)
{
- get_layout().set_gravity(get_last_widget(), h, v);
+ obj.get_or_create_layout().set_gravity(get_last_widget(), h, v);
}
-void Panel::Loader::grid(unsigned cols)
+void Panel::Loader::grid(size_t cols)
{
- Grid grd(get_layout(), cols);
+ Grid grd(obj.get_or_create_layout(), cols);
ArrangedLoader<Grid> ldr(*this, grd);
load_sub_with(ldr);
}
void Panel::Loader::layout()
{
- Layout::Loader ldr(get_layout(), wdg_map);
+ Layout::Loader ldr(obj.get_or_create_layout(), wdg_map);
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();
+ unique_ptr<Panel> pnl = make_unique<Panel>();
+ load_sub(*pnl, wdg_map);
+ Widget *wdg = pnl.get();
+ obj.add(move(pnl));
+ last_widget = wdg;
}
projects / libs / gltk.git / blobdiff