X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpanel.cpp;h=7876120b2ce2e7cea30cecb52fd42aeef2b11185;hb=5093559790a7d51d288018cfffda32082faf5f27;hp=59553b45de0122136a4c410ebf06a50ed378f6e4;hpb=0af3c2393bd00f39db3bfaf5b78a7a44f0fd5ff1;p=libs%2Fgltk.git

diff --git a/source/panel.cpp b/source/panel.cpp
index 59553b4..7876120 100644
--- a/source/panel.cpp
+++ b/source/panel.cpp
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of libmspgltk
-Copyright © 2007-2009  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include <algorithm>
 #include <msp/core/refptr.h>
 #include "button.h"
@@ -13,6 +6,7 @@ Distributed under the LGPL
 #include "hslider.h"
 #include "indicator.h"
 #include "label.h"
+#include "layout.h"
 #include "list.h"
 #include "panel.h"
 #include "part.h"
@@ -25,14 +19,29 @@ using namespace std;
 namespace Msp {
 namespace GLtk {
 
-Panel::Panel(const Resources &r):
-	Widget(r),
-	Container(r),
+Panel::Panel():
+	layout(0),
 	pointer_focus(0),
 	pointer_grabbed(false),
 	input_focus(0)
+{ }
+
+Panel::~Panel()
+{
+	delete layout;
+	layout = 0;
+}
+
+void Panel::set_layout(Layout *l)
 {
-	update_style();
+	l->set_container(*this);
+	delete layout;
+	layout = l;
+}
+
+Panel::Child *Panel::create_child(Widget *wdg)
+{
+	return new Child(*this, wdg);
 }
 
 void Panel::raise(Widget &wdg)
@@ -44,7 +53,7 @@ void Panel::raise(Widget &wdg)
 			return;
 		}
 
-	throw InvalidState("That Widget is not in this Panel");
+	throw hierarchy_error("widget not in panel");
 }
 
 Widget *Panel::get_final_input_focus() const
@@ -58,6 +67,16 @@ Widget *Panel::get_final_input_focus() const
 	return input_focus;
 }
 
+void Panel::render_special(const Part &part) const
+{
+	if(part.get_name()=="children")
+	{
+		for(list<Container::Child *>::const_iterator i=children.begin(); i!=children.end(); ++i)
+			if((*i)->widget->is_visible())
+				(*i)->widget->render();
+	}
+}
+
 void Panel::button_press(int x, int y, unsigned btn)
 {
 	if(pointer_grabbed)
@@ -108,10 +127,10 @@ void Panel::pointer_leave()
 	set_pointer_focus(0);
 }
 
-void Panel::key_press(unsigned key, unsigned mod, wchar_t ch)
+void Panel::key_press(unsigned key, unsigned mod)
 {
 	if(input_focus)
-		input_focus->key_press(key, mod, ch);
+		input_focus->key_press(key, mod);
 }
 
 void Panel::key_release(unsigned key, unsigned mod)
@@ -120,24 +139,34 @@ void Panel::key_release(unsigned key, unsigned mod)
 		input_focus->key_release(key, mod);
 }
 
+void Panel::character(wchar_t ch)
+{
+	if(input_focus)
+		input_focus->character(ch);
+}
+
 void Panel::focus_out()
 {
 	set_input_focus(0);
+	Widget::focus_out();
 }
 
-void Panel::render_special(const Part &part) const
+void Panel::on_geometry_change()
 {
-	if(part.get_name()=="children")
-	{
-		for(list<Container::Child *>::const_iterator i=children.begin(); i!=children.end(); ++i)
-			if((*i)->widget->is_visible())
-				(*i)->widget->render();
-	}
+	if(layout)
+		layout->update();
 }
 
-Panel::Child *Panel::create_child(Widget *wdg)
+void Panel::on_child_added(Widget &wdg)
 {
-	return new Child(*this, wdg);
+	if(layout)
+		layout->add_widget(wdg);
+}
+
+void Panel::on_child_removed(Widget &wdg)
+{
+	if(layout)
+		layout->remove_widget(wdg);
 }
 
 void Panel::set_pointer_focus(Widget *wdg)
@@ -193,7 +222,7 @@ Panel::Loader::Loader(Panel &p, map<string, Widget *> &m):
 template<typename T>
 void Panel::Loader::child(const string &n)
 {
-	RefPtr<T> chl = new T(pnl.res);
+	RefPtr<T> chl = new T();
 	load_sub(*chl);
 	pnl.add(*chl.get());
 	wdg_map[n] = chl.release();
@@ -201,7 +230,7 @@ void Panel::Loader::child(const string &n)
 
 void Panel::Loader::panel(const string &n)
 {
-	RefPtr<Panel> p = new Panel(pnl.res);
+	RefPtr<Panel> p = new Panel();
 	load_sub(*p, wdg_map);
 	pnl.add(*p.get());
 	wdg_map[n] = p.release();
@@ -234,6 +263,13 @@ void Panel::Child::visibility_changed(bool v)
 	}
 }
 
+void Panel::Child::autosize_changed()
+{
+	Panel &panel = static_cast<Panel &>(container);
+	if(panel.layout)
+		panel.layout->update();
+}
+
 void Panel::Child::request_focus()
 {
 	Panel &panel = static_cast<Panel &>(container);