Allow loading generic layout properties from datafiles

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

diff --git a/source/panel.cpp b/source/panel.cpp
index 389e3d9be729485fc4c16db0ee4dca3237a5f3ed..8c5dd38f26be2d400640258882da93c24a50690a 100644 (file)
--- a/source/panel.cpp
+++ b/source/panel.cpp
@@ -1,15 +1,18 @@
 #include <algorithm>
+#include <msp/core/maputils.h>
 #include <msp/core/refptr.h>
 #include "button.h"
+#include "column.h"
 #include "dropdown.h"
 #include "entry.h"
+#include "grid.h"
 #include "hslider.h"
 #include "indicator.h"
 #include "label.h"
-#include "layout.h"
 #include "list.h"
 #include "panel.h"
 #include "part.h"
+#include "row.h"
 #include "toggle.h"
 #include "vslider.h"
 
@@ -77,37 +80,107 @@ void Panel::on_child_removed(Widget &wdg)
 
 
 Panel::Loader::Loader(Panel &p, map<string, Widget *> &m):
-       Widget::Loader(p),
-       pnl(p),
-       wdg_map(m)
+       DataFile::DerivedObjectLoader<Panel, Widget::Loader>(p),
+       wdg_map(m),
+       last_widget(0)
 {
        add("button",    &Loader::child<Button>);
+       add("column",    &Loader::arrangement<Column>);
+       add("constraint",&Loader::constraint);
        add("dropdown",  &Loader::child<Dropdown>);
        add("entry",     &Loader::child<Entry>);
+       add("expand",    &Loader::expand);
+       add("gravity",   &Loader::gravity);
+       add("grid",      &Loader::grid);
        add("hslider",   &Loader::child<HSlider>);
        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("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);
-       pnl.add(*chl.get());
-       wdg_map[n] = chl.release();
+       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);
+}
+
+void Panel::Loader::expand(bool h, bool v)
+{
+       get_layout().set_expand(get_last_widget(), h, v);
+}
+
+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)
 {
        RefPtr<Panel> p = new Panel();
        load_sub(*p, wdg_map);
-       pnl.add(*p.get());
-       wdg_map[n] = p.release();
+       obj.add(*p.get());
+       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