X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpanel.h;h=09096f75c0b06855d3879f517702cde14245b4a2;hb=6deafc9f236b90175a303944815f7c0eac1c95c1;hp=756108a5cafce149f688906dcb196dcd4c5e5ef4;hpb=cfb830ca263defc307f9cfac74fb6771f6b7bfc6;p=libs%2Fgltk.git diff --git a/source/panel.h b/source/panel.h index 756108a..09096f7 100644 --- a/source/panel.h +++ b/source/panel.h @@ -1,6 +1,7 @@ #ifndef MSP_GLTK_PANEL_H_ #define MSP_GLTK_PANEL_H_ +#include #include "container.h" #include "layout.h" @@ -21,6 +22,12 @@ public: typedef std::map WidgetMap; protected: + template + struct AddChildType + { + void operator()(const std::string &, Loader &) const; + }; + WidgetMap &wdg_map; Widget *last_widget; @@ -28,8 +35,6 @@ public: Loader(Panel &, WidgetMap &); private: - template - void add_child_type(const std::string &); Layout &get_layout(); Widget &get_last_widget(); template @@ -44,6 +49,8 @@ public: void layout(); template void unnamed_child(); + + friend class Panel; }; private: @@ -61,12 +68,18 @@ protected: std::vector nav_order; Layout *layout; + static TypeRegistry widget_registry; + static bool widget_registry_init_done; + Panel(const Panel &); Panel &operator=(const Panel &); public: Panel(); virtual ~Panel(); + template + static void register_child_type(const std::string &); + virtual const char *get_class() const { return "panel"; } void set_layout(Layout *); @@ -82,11 +95,43 @@ protected: Widget *find_next_child(int, int, int, int, int) const; static int compute_delta(int, int, int, int, int); - virtual void on_geometry_change(); + virtual void on_size_change(); virtual void on_child_added(Widget &); virtual void on_child_removed(Widget &); }; + +template +void Panel::register_child_type(const std::string &name) +{ + widget_registry.register_type(name); +} + + +template +void Panel::Loader::child(const std::string &n) +{ + unnamed_child(); + wdg_map[n] = last_widget; +} + +template +void Panel::Loader::unnamed_child() +{ + RefPtr chl = new T(); + load_sub(*chl); + obj.add(*chl.get()); + last_widget = chl.release(); +} + + +template +void Panel::Loader::AddChildType::operator()(const std::string &kwd, Loader &ldr) const +{ + ldr.add(kwd, &Loader::child); + ldr.add(kwd, &Loader::unnamed_child); +} + } // namespace GLtk } // namespace Msp