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

diff --git a/source/panel.h b/source/panel.h
index 1126e83..3061032 100644
--- a/source/panel.h
+++ b/source/panel.h
@@ -1,97 +1,135 @@
 #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 {
 
-class Layout;
-
 /**
 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 Widget::Loader
+	class Loader: public DataFile::DerivedObjectLoader<Panel, Widget::Loader>
 	{
 	public:
 		typedef std::map<std::string, Widget *> WidgetMap;
 
-	private:
-		Panel &pnl;
+	protected:
+		template<typename T>
+		struct AddChildType
+		{
+			void operator()(const std::string &, Loader &) const;
+		};
+
 		WidgetMap &wdg_map;
-	
+		Widget *last_widget;
+
 	public:
 		Loader(Panel &, WidgetMap &);
+
 	private:
+		Widget &get_last_widget();
+		template<typename T>
+		void arrangement();
 		template<typename T>
 		void child(const std::string &);
-		void panel(const std::string &);
+		void constraint(Layout::ConstraintType, const std::string &);
+		void expand(bool, bool);
+		void ghost(bool);
+		void gravity(int, int);
+		void grid(std::size_t);
+		void layout();
+		template<typename T>
+		void unnamed_child();
+
+		friend class Panel;
 	};
 
-protected:
-	struct Child: public Container::Child
+private:
+	template<typename T>
+	class ArrangedLoader: public DataFile::Loader
 	{
-		Child(Panel &, Widget *);
-		virtual ~Child();
-
-		void visibility_changed(bool);
-		void autosize_changed();
-		void request_focus();
-		void grab_pointer();
-		void ungrab_pointer();
-		void raise();
+	private:
+		typename T::Loader arr_loader;
+
+	public:
+		ArrangedLoader(Loader &, T &);
 	};
 
-	Layout *layout;
-	Widget *pointer_focus;
-	bool pointer_grabbed;
-	Widget *input_focus;
+protected:
+	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 &);
 
-	void set_layout(Layout *);
-	virtual void autosize();
+	const char *get_class() const override { return "panel"; }
 
-protected:
-	virtual Child *create_child(Widget *);
-
-public:
-	void raise(Widget &);
-	Widget *get_input_focus() const { return input_focus; }
-	Widget *get_final_input_focus() const;
+	Layout &get_or_create_layout();
 
 protected:
-	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 void button_press(int, int, unsigned);
-	virtual void button_release(int, int, unsigned);
-	virtual void pointer_motion(int, int);
-	virtual void pointer_leave();
-	virtual void key_press(unsigned, unsigned);
-	virtual void key_release(unsigned, unsigned);
-	virtual void character(wchar_t);
-	virtual void focus_out();
+	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 set_pointer_focus(Widget *);
-	void set_input_focus(Widget *);
+	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