From: Mikko Rasa <tdb@tdb.fi>
Date: Wed, 17 Oct 2007 06:57:31 +0000 (+0000)
Subject: Enable loading of widgets from datafiles (not implemented for all widgets yet)
X-Git-Tag: 0.9~29
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=e7bc29984e91ee36555d6a4e4eece22170d10ba4;p=libs%2Fgltk.git

Enable loading of widgets from datafiles (not implemented for all widgets yet)
---

diff --git a/source/label.cpp b/source/label.cpp
index d0aba35..9676fa3 100644
--- a/source/label.cpp
+++ b/source/label.cpp
@@ -24,5 +24,17 @@ void Label::render_part(const Part &part) const
 		Widget::render_part(part);
 }
 
+
+Label::Loader::Loader(Label &l):
+	Widget::Loader(l)
+{
+	add("text", &Label::text);
+}
+
+Label &Label::Loader::get_object()
+{
+	return static_cast<Label &>(wdg);
+}
+
 } // namespace GLtk
 } // namespace Msp
diff --git a/source/label.h b/source/label.h
index 3de71b7..8380ef0 100644
--- a/source/label.h
+++ b/source/label.h
@@ -9,6 +9,13 @@ namespace GLtk {
 class Label: public Widget
 {
 public:
+	class Loader: public Widget::Loader
+	{
+	public:
+		Loader(Label &);
+		Label &get_object();
+	};
+
 	Label(const Resources &, const std::string & =std::string());
 	void set_text(const std::string &);
 private:
diff --git a/source/panel.cpp b/source/panel.cpp
index d3e8df0..c93d430 100644
--- a/source/panel.cpp
+++ b/source/panel.cpp
@@ -1,6 +1,10 @@
+#include <msp/core/refptr.h>
+#include "label.h"
 #include "panel.h"
 #include "part.h"
 
+using namespace std;
+
 namespace Msp {
 namespace GLtk {
 
@@ -142,5 +146,23 @@ void Panel::set_input_focus(Widget *wdg)
 	}
 }
 
+
+Panel::Loader::Loader(Panel &p, map<string, Widget *> &m):
+	Widget::Loader(p),
+	panel(p),
+	wdg_map(m)
+{
+	add("label", &Loader::child<Label>);
+}
+
+template<typename T>
+void Panel::Loader::child(const string &n)
+{
+	RefPtr<T> chl=new T(panel.res);
+	load_sub(*chl);
+	panel.add(*chl.get());
+	wdg_map[n]=chl.release();
+}
+
 } // namespace GLtk
 } // namespace Msp
diff --git a/source/panel.h b/source/panel.h
index 2fa7d8f..bf17829 100644
--- a/source/panel.h
+++ b/source/panel.h
@@ -9,6 +9,19 @@ namespace GLtk {
 class Panel: public Widget
 {
 public:
+	class Loader: public Widget::Loader
+	{
+	private:
+		Panel &panel;
+		std::map<std::string, Widget *> &wdg_map;
+	
+	public:
+		Loader(Panel &, std::map<std::string, Widget *> &);
+	private:
+		template<typename T>
+		void child(const std::string &);
+	};
+
 	Panel(const Resources &);
 	~Panel();
 
diff --git a/source/root.cpp b/source/root.cpp
index f8a4d9f..83042a6 100644
--- a/source/root.cpp
+++ b/source/root.cpp
@@ -9,10 +9,27 @@ Root::Root(Resources &r, Window &w):
 {
 	set_geometry(Geometry(0, 0, window.get_width(), window.get_height()));
 
+	update_style();
+
 	window.signal_button_press.connect(sigc::mem_fun(this, &Root::button_press_event));
 	window.signal_button_release.connect(sigc::mem_fun(this, &Root::button_release_event));
 	window.signal_pointer_motion.connect(sigc::mem_fun(this, &Root::pointer_motion_event));
 }
 
+void Root::button_press_event(int x, int y, unsigned btn, unsigned)
+{
+	button_press(x, y, btn);
+}
+
+void Root::button_release_event(int x, int y, unsigned btn, unsigned)
+{
+	button_release(x, y, btn);
+}
+
+void Root::pointer_motion_event(int x, int y)
+{
+	pointer_motion(x, y);
+}
+
 } // namespace GLtk
 } // namespace Msp
diff --git a/source/widget.cpp b/source/widget.cpp
index d1f21bc..f03ed39 100644
--- a/source/widget.cpp
+++ b/source/widget.cpp
@@ -93,5 +93,29 @@ void Widget::render_text(const Part &part, const string &text) const
 	GL::pop_matrix();
 }
 
+
+Widget::Loader::Loader(Widget &w):
+	wdg(w)
+{
+	add("position", &Loader::position);
+	add("size",     &Loader::size);
+	add("style",    &Loader::style);
+}
+
+void Widget::Loader::position(int x, int y)
+{
+	wdg.set_position(x, y);
+}
+
+void Widget::Loader::size(unsigned w, unsigned h)
+{
+	wdg.set_size(w, h);
+}
+
+void Widget::Loader::style(const string &s)
+{
+	wdg.set_style(s);
+}
+
 } // namespace GLtk
 } // namespace Msp
diff --git a/source/widget.h b/source/widget.h
index 47bc410..79187f3 100644
--- a/source/widget.h
+++ b/source/widget.h
@@ -15,6 +15,19 @@ class Style;
 class Widget
 {
 public:
+	class Loader: public Msp::DataFile::Loader
+	{
+	protected:
+		Widget &wdg;
+
+	public:
+		Loader(Widget &);
+	private:
+		void position(int, int);
+		void size(unsigned, unsigned);
+		void style(const std::string &);
+	};
+
 	virtual ~Widget() { }
 	void set_position(int, int);
 	void set_size(unsigned, unsigned);