X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fpanel.cpp;h=2ede2a9c77fd8b32a105971b894fb5fba66d3919;hb=fdc7fecc65f5f517d66abe3546a949a46836c4a6;hp=f0c1c7c69f0f120b2d2696a049b75a3d975d3ed4;hpb=91997dd3189b93a67179822ec2fed5f2a7bddb74;p=libs%2Fgltk.git

diff --git a/source/panel.cpp b/source/panel.cpp
index f0c1c7c..2ede2a9 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"
@@ -26,11 +20,36 @@ namespace Msp {
 namespace GLtk {
 
 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)
+{
+	l->set_container(*this);
+	delete layout;
+	layout = l;
+}
+
+void Panel::autosize()
+{
+	if(layout)
+		layout->autosize();
+}
+
+Panel::Child *Panel::create_child(Widget *wdg)
+{
+	return new Child(*this, wdg);
+}
+
 void Panel::raise(Widget &wdg)
 {
 	for(list<Container::Child *>::iterator i=children.begin(); i!=children.end(); ++i)
@@ -40,7 +59,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
@@ -54,6 +73,16 @@ Widget *Panel::get_final_input_focus() const
 	return input_focus;
 }
 
+void Panel::render_special(const Part &part, GL::Renderer &renderer) 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(renderer);
+	}
+}
+
 void Panel::button_press(int x, int y, unsigned btn)
 {
 	if(pointer_grabbed)
@@ -104,10 +133,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)
@@ -116,24 +145,40 @@ 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")
+	if(layout)
+		layout->update();
+}
+
+void Panel::on_child_added(Widget &wdg)
+{
+	if(layout)
 	{
-		for(list<Container::Child *>::const_iterator i=children.begin(); i!=children.end(); ++i)
-			if((*i)->widget->is_visible())
-				(*i)->widget->render();
+		layout->add_widget(wdg);
+		signal_autosize_changed.emit();
 	}
 }
 
-Panel::Child *Panel::create_child(Widget *wdg)
+void Panel::on_child_removed(Widget &wdg)
 {
-	return new Child(*this, wdg);
+	if(layout)
+	{
+		layout->remove_widget(wdg);
+		signal_autosize_changed.emit();
+	}
 }
 
 void Panel::set_pointer_focus(Widget *wdg)
@@ -230,6 +275,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);