X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpanel.h;h=79e8bd455a3b36cbd76f9f113641cb81baa79731;hb=8eeb6ee5d40c21150839e24996cc3e9ef308374d;hp=dc9841654aa7b623e948610910f0fa35455907a1;hpb=91997dd3189b93a67179822ec2fed5f2a7bddb74;p=libs%2Fgltk.git

diff --git a/source/panel.h b/source/panel.h
index dc98416..79e8bd4 100644
--- a/source/panel.h
+++ b/source/panel.h
@@ -1,14 +1,8 @@
-/* $Id$
-
-This file is part of libmspgltk
-Copyright © 2007-2009  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_GLTK_PANEL_H_
 #define MSP_GLTK_PANEL_H_
 
 #include "container.h"
+#include "layout.h"
 
 namespace Msp {
 namespace GLtk {
@@ -21,60 +15,63 @@ ignored.
 class Panel: public Container
 {
 public:
-	class Loader: public Widget::Loader
+	class Loader: public DataFile::DerivedObjectLoader<Panel, Widget::Loader>
 	{
-	private:
-		Panel &pnl;
-		std::map<std::string, Widget *> &wdg_map;
+	public:
+		typedef std::map<std::string, Widget *> WidgetMap;
+
+	protected:
+		WidgetMap &wdg_map;
+		Widget *last_widget;
 	
 	public:
-		Loader(Panel &, std::map<std::string, Widget *> &);
+		Loader(Panel &, WidgetMap &);
 	private:
+		Layout &get_layout();
+		Widget &get_last_widget();
+		template<typename T>
+		void arrangement();
 		template<typename T>
 		void child(const std::string &);
+		void constraint(Layout::ConstraintType, const std::string &);
+		void expand(bool, bool);
+		void gravity(int, int);
+		void grid(unsigned);
+		void layout();
 		void panel(const std::string &);
 	};
 
-protected:
-	struct Child: public Container::Child
+private:
+	template<typename T>
+	class ArrangedLoader: public DataFile::Loader
 	{
-		Child(Panel &, Widget *);
-		virtual ~Child();
+	private:
+		typename T::Loader arr_loader;
 
-		void visibility_changed(bool);
-		void request_focus();
-		void grab_pointer();
-		void ungrab_pointer();
-		void raise();
+	public:
+		ArrangedLoader(Loader &, T &);
 	};
 
-	Widget *pointer_focus;
-	bool pointer_grabbed;
-	Widget *input_focus;
+protected:
+	Layout *layout;
 
 	Panel(const Panel &);
 	Panel &operator=(const Panel &);
 public:
 	Panel();
+	virtual ~Panel();
 
-	void raise(Widget &);
-	Widget *get_input_focus() const { return input_focus; }
-	Widget *get_final_input_focus() const;
+	virtual const char *get_class() const { return "panel"; }
+
+	void set_layout(Layout *);
+	virtual void autosize();
 
-	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, wchar_t);
-	virtual void key_release(unsigned, unsigned);
-	virtual void focus_out();
 protected:
-	virtual const char *get_class() const { return "panel"; }
-	virtual void render_special(const Part &) const;
-	virtual Child *create_child(Widget *);
+	virtual void render_special(const Part &, GL::Renderer &) const;
 
-	void set_pointer_focus(Widget *);
-	void set_input_focus(Widget *);
+	virtual void on_geometry_change();
+	virtual void on_child_added(Widget &);
+	virtual void on_child_removed(Widget &);
 };
 
 } // namespace GLtk