X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpanel.cpp;h=c97cd6d7212da9c648cbed683edf23dad4250701;hb=7286d604956ddffcbfa2df6567de866f3d5df3a2;hp=97e13a2591b34dd9107f2dd65c22baa86750f676;hpb=cfb830ca263defc307f9cfac74fb6771f6b7bfc6;p=libs%2Fgltk.git

diff --git a/source/panel.cpp b/source/panel.cpp
index 97e13a2..c97cd6d 100644
--- a/source/panel.cpp
+++ b/source/panel.cpp
@@ -24,6 +24,9 @@ using namespace std;
 namespace Msp {
 namespace GLtk {
 
+DataFile::LoadableTypeRegistry<Panel::Loader, Panel::Loader::AddChildType> Panel::widget_registry;
+bool Panel::widget_registry_init_done = false;
+
 Panel::Panel():
 	layout(0)
 {
@@ -173,7 +176,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();
@@ -210,34 +213,33 @@ Panel::Loader::Loader(Panel &p, map<string, Widget *> &m):
 	wdg_map(m),
 	last_widget(0)
 {
-	add_child_type<Button>("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<Toggle>("toggle");
+		register_child_type<VSlider>("vslider");
+	}
+
 	add("column",    &Loader::arrangement<Column>);
 	add("constraint",&Loader::constraint);
-	add_child_type<DragHandle>("draghandle");
-	add_child_type<Dropdown>("dropdown");
-	add_child_type<Entry>("entry");
 	add("expand",    &Loader::expand);
 	add("ghost",     &Loader::ghost);
 	add("gravity",   &Loader::gravity);
 	add("grid",      &Loader::grid);
-	add_child_type<HSlider>("hslider");
-	add_child_type<Image>("image");
-	add_child_type<Indicator>("indicator");
-	add_child_type<Label>("label");
 	add("layout",    &Loader::layout);
-	add_child_type<List>("list");
-	add_child_type<Panel>("panel");
 	add("row",       &Loader::arrangement<Row>);
 	add("stack",     &Loader::arrangement<Stack>);
-	add_child_type<Toggle>("toggle");
-	add_child_type<VSlider>("vslider");
-}
-
-template<typename T>
-void Panel::Loader::add_child_type(const string &keyword)
-{
-	add(keyword, &Loader::child<T>);
-	add(keyword, &Loader::unnamed_child<T>);
+	widget_registry.add_all(*this);
 }
 
 Layout &Panel::Loader::get_layout()
@@ -264,13 +266,6 @@ void Panel::Loader::arrangement()
 	load_sub_with(ldr);
 }
 
-template<typename T>
-void Panel::Loader::child(const string &n)
-{
-	unnamed_child<T>();
-	wdg_map[n] = last_widget;
-}
-
 void Panel::Loader::constraint(Layout::ConstraintType type, const string &n)
 {
 	Widget &src = get_last_widget();
@@ -306,15 +301,6 @@ void Panel::Loader::layout()
 	load_sub_with(ldr);
 }
 
-template<typename T>
-void Panel::Loader::unnamed_child()
-{
-	RefPtr<T> chl = new T();
-	load_sub(*chl);
-	obj.add(*chl.get());
-	last_widget = chl.release();
-}
-
 template<>
 void Panel::Loader::unnamed_child<Panel>()
 {
@@ -324,6 +310,7 @@ void Panel::Loader::unnamed_child<Panel>()
 	last_widget = pnl.release();
 }
 
+
 template<typename T>
 Panel::ArrangedLoader<T>::ArrangedLoader(Loader &ldr, T &arr):
 	arr_loader(arr)