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

diff --git a/source/panel.h b/source/panel.h
index 529354d..79e8bd4 100644
--- a/source/panel.h
+++ b/source/panel.h
@@ -1,14 +1,8 @@
-/* $Id$
-
-This file is part of libmspgltk
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_GLTK_PANEL_H_
 #define MSP_GLTK_PANEL_H_
 
-#include "widget.h"
+#include "container.h"
+#include "layout.h"
 
 namespace Msp {
 namespace GLtk {
@@ -18,59 +12,66 @@ 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 Widget
+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 &);
 	};
 
 private:
-	typedef std::list<Widget *> ChildSeq;
+	template<typename T>
+	class ArrangedLoader: public DataFile::Loader
+	{
+	private:
+		typename T::Loader arr_loader;
+
+	public:
+		ArrangedLoader(Loader &, T &);
+	};
 
-	ChildSeq children;
-	Widget *pointer_focus;
-	unsigned pointer_grab;
-	Widget *input_focus;
+protected:
+	Layout *layout;
 
 	Panel(const Panel &);
 	Panel &operator=(const Panel &);
 public:
-	Panel(const Resources &);
-	~Panel();
+	Panel();
+	virtual ~Panel();
 
-	void add(Widget &);
-	void remove(Widget &);
-	void raise(Widget &);
+	virtual const char *get_class() const { return "panel"; }
 
-	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();
+	void set_layout(Layout *);
+	virtual void autosize();
 
-	void child_hidden(Widget &);
-	void grab_pointer(Widget &);
-	void ungrab_pointer(Widget &);
-private:
-	virtual const char *get_class() const { return "panel"; }
-	virtual void render_special(const Part &) const;
+protected:
+	virtual void render_special(const Part &, GL::Renderer &) const;
 
-	void set_pointer_focus(Widget *, int);
-	void set_input_focus(Widget *);
-	Widget *get_child_at(int, int);
+	virtual void on_geometry_change();
+	virtual void on_child_added(Widget &);
+	virtual void on_child_removed(Widget &);
 };
 
 } // namespace GLtk