X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpanel.h;h=3061032789574f168c2bb2933f787d4f439c1284;hb=HEAD;hp=ebe765ddcf5f541c8d661231b1957536999978a8;hpb=ae62c05fe97d341c4f219656cdce7aadf321991b;p=libs%2Fgltk.git

diff --git a/source/panel.h b/source/panel.h
index ebe765d..3061032 100644
--- a/source/panel.h
+++ b/source/panel.h
@@ -1,8 +1,11 @@
 #ifndef MSP_GLTK_PANEL_H_
 #define MSP_GLTK_PANEL_H_
 
+#include <memory>
+#include <msp/core/typeregistry.h>
 #include "container.h"
 #include "layout.h"
+#include "mspgltk_api.h"
 
 namespace Msp {
 namespace GLtk {
@@ -12,7 +15,7 @@ Panels are containers for other widgets.  Panel styles should have a special
 part "children" to render the child widgets.  All properties of this part are
 ignored.
 */
-class Panel: public Container
+class MSPGLTK_API Panel: public Container
 {
 public:
 	class Loader: public DataFile::DerivedObjectLoader<Panel, Widget::Loader>
@@ -21,13 +24,19 @@ public:
 		typedef std::map<std::string, Widget *> WidgetMap;
 
 	protected:
+		template<typename T>
+		struct AddChildType
+		{
+			void operator()(const std::string &, Loader &) const;
+		};
+
 		WidgetMap &wdg_map;
 		Widget *last_widget;
 
 	public:
 		Loader(Panel &, WidgetMap &);
+
 	private:
-		Layout &get_layout();
 		Widget &get_last_widget();
 		template<typename T>
 		void arrangement();
@@ -37,9 +46,12 @@ public:
 		void expand(bool, bool);
 		void ghost(bool);
 		void gravity(int, int);
-		void grid(unsigned);
+		void grid(std::size_t);
 		void layout();
-		void panel(const std::string &);
+		template<typename T>
+		void unnamed_child();
+
+		friend class Panel;
 	};
 
 private:
@@ -54,32 +66,70 @@ private:
 	};
 
 protected:
-	Layout *layout;
+	std::vector<Widget *> nav_order;
+	std::unique_ptr<Layout> layout;
+
+	static TypeRegistry<Loader::AddChildType, Loader &> widget_registry;
+	static bool widget_registry_init_done;
 
-	Panel(const Panel &);
-	Panel &operator=(const Panel &);
 public:
 	Panel();
-	virtual ~Panel();
 
-	virtual const char *get_class() const { return "panel"; }
+	template<typename T>
+	static void register_child_type(const std::string &);
+
+	const char *get_class() const override { return "panel"; }
 
-	void set_layout(Layout *);
-	Layout *get_layout() { return layout; }
+	Layout &get_or_create_layout();
 
 protected:
-	virtual void autosize_special(const Part &, Geometry &) const;
-	virtual void render_special(const Part &, GL::Renderer &) const;
+	void autosize_special(const Part &, Geometry &) const override;
+	void render_special(const Part &, GL::Renderer &) const override;
 
 public:
-	virtual bool navigate(Navigation);
-
+	bool navigate(Navigation) override;
 protected:
-	virtual void on_geometry_change();
-	virtual void on_child_added(Widget &);
-	virtual void on_child_removed(Widget &);
+	Widget *find_next_child(int, int, int, int, int) const;
+	static int compute_delta(int, int, int, int, int);
+
+	void on_size_change() override;
+	void on_child_added(Widget &) override;
+	void on_child_removed(Widget &) override;
 };
 
+
+template<typename T>
+void Panel::register_child_type(const std::string &name)
+{
+	widget_registry.register_type<T>(name);
+}
+
+
+template<typename T>
+void Panel::Loader::child(const std::string &n)
+{
+	unnamed_child<T>();
+	wdg_map[n] = last_widget;
+}
+
+template<typename T>
+void Panel::Loader::unnamed_child()
+{
+	std::unique_ptr<T> chl = std::make_unique<T>();
+	load_sub(*chl);
+	Widget *wdg = chl.get();
+	obj.add(move(chl));
+	last_widget = wdg;
+}
+
+
+template<typename T>
+void Panel::Loader::AddChildType<T>::operator()(const std::string &kwd, Loader &ldr) const
+{
+	ldr.add(kwd, &Loader::child<T>);
+	ldr.add(kwd, &Loader::unnamed_child<T>);
+}
+
 } // namespace GLtk
 } // namespace Msp