X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpanel.h;h=8d67d14ffe46ff7b7ef5afaedfb83ce912da09b9;hb=91583e23889a7654fab6669821979b36c1819606;hp=c50725b9b940cb255ed635ad665cc82c55bddfe7;hpb=1b29f1987b8891852a606afbb03e5e08b16c8c3e;p=libs%2Fgltk.git

diff --git a/source/panel.h b/source/panel.h
index c50725b..8d67d14 100644
--- a/source/panel.h
+++ b/source/panel.h
@@ -2,12 +2,11 @@
 #define MSP_GLTK_PANEL_H_
 
 #include "container.h"
+#include "layout.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
@@ -16,21 +15,46 @@ ignored.
 class 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:
 		WidgetMap &wdg_map;
-	
+		Widget *last_widget;
+
 	public:
 		Loader(Panel &, WidgetMap &);
+
 	private:
+		template<typename T>
+		void add_child_type(const std::string &);
+		Layout &get_layout();
+		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(unsigned);
+		void layout();
+		template<typename T>
+		void unnamed_child();
+	};
+
+private:
+	template<typename T>
+	class ArrangedLoader: public DataFile::Loader
+	{
+	private:
+		typename T::Loader arr_loader;
+
+	public:
+		ArrangedLoader(Loader &, T &);
 	};
 
 protected:
@@ -45,11 +69,18 @@ public:
 	virtual const char *get_class() const { return "panel"; }
 
 	void set_layout(Layout *);
-	virtual void autosize();
+	Layout *get_layout() { return layout; }
 
 protected:
+	virtual void autosize_special(const Part &, Geometry &) const;
 	virtual void render_special(const Part &, GL::Renderer &) const;
 
+public:
+	virtual bool navigate(Navigation);
+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_child_added(Widget &);
 	virtual void on_child_removed(Widget &);