X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fwidget.cpp;h=1cb42e5cae15598cdd82ea25809913e59a8359e7;hb=c1faa54a3218b53757b8b55de0ff8aa64412253b;hp=434ec454ea022beb1a31964025c7a98808d25d8f;hpb=91997dd3189b93a67179822ec2fed5f2a7bddb74;p=libs%2Fgltk.git

diff --git a/source/widget.cpp b/source/widget.cpp
index 434ec45..1cb42e5 100644
--- a/source/widget.cpp
+++ b/source/widget.cpp
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of libmspgltk
-Copyright © 2007-2009  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include <msp/gl/immediate.h>
 #include <msp/gl/matrix.h>
 #include <msp/gl/transform.h>
@@ -30,7 +23,11 @@ Widget::Widget():
 Widget::~Widget()
 {
 	if(parent)
-		parent->remove(*this);
+	{
+		Container *p = parent;
+		parent = 0;
+		p->remove(*this);
+	}
 }
 
 void Widget::set_position(int x, int y)
@@ -47,18 +44,66 @@ void Widget::set_size(unsigned w, unsigned h)
 	on_geometry_change();
 }
 
+void Widget::autosize()
+{
+	geom.w = 0;
+	geom.h = 0;
+	const Style::PartSeq &parts = style->get_parts();
+	for(Style::PartSeq::const_iterator i=parts.begin(); i!=parts.end(); ++i)
+		if(i->get_name().empty())
+		{
+			geom.w = max(geom.w, i->get_geometry().w);
+			geom.h = max(geom.h, i->get_geometry().h);
+		}
+}
+
 void Widget::set_geometry(const Geometry &g)
 {
 	geom = g;
 	on_geometry_change();
 }
 
+void Widget::set_parent(Container *p)
+{
+	if(parent && p)
+		throw hierarchy_error("widget already parented");
+	else if(p==parent)
+		return;
+	parent = p;
+
+	on_reparent();
+	update_style();
+}
+
 void Widget::set_style(const string &s)
 {
 	style_name = s;
 	update_style();
 }
 
+void Widget::update_style()
+{
+	Widget *top;
+	for(top=this; top->parent; top=top->parent) ;
+	Root *root = dynamic_cast<Root *>(top);
+	if(!root)
+		style = 0;
+	else
+	{
+		string sname = get_class();
+		if(!style_name.empty())
+		{
+			sname += '-';
+			sname += style_name;
+		}
+
+		style = root->get_resources().get<Style>(sname);
+	}
+
+	on_style_change();
+	signal_autosize_changed.emit();
+}
+
 void Widget::set_tooltip(const string &t)
 {
 	tooltip = t;
@@ -82,9 +127,9 @@ void Widget::set_focusable(bool f)
 void Widget::set_focus()
 {
 	if(!parent)
-		throw InvalidState("No parent");
+		throw hierarchy_error("no parent");
 	if(!visible)
-		throw InvalidState("Can't set focus on invisible widget");
+		throw logic_error("!visible");
 
 	signal_request_focus.emit();
 }
@@ -92,11 +137,12 @@ void Widget::set_focus()
 void Widget::render() const
 {
 	if(!style)
-		throw InvalidState(format("Attempt to render a widget with null style (class=\"%s\", style_name=\"%s\")", get_class(), style_name));
+		throw logic_error(format("Attempt to render a widget with null style (class=\"%s\", style_name=\"%s\")", get_class(), style_name));
 
 	GL::push_matrix();
 	GL::translate(geom.x, geom.y, 0);
-	for(PartSeq::const_iterator i=style->get_parts().begin(); i!=style->get_parts().end(); ++i)
+	const Style::PartSeq &parts = style->get_parts();
+	for(Style::PartSeq::const_iterator i=parts.begin(); i!=parts.end(); ++i)
 	{
 		if(i->get_name().empty())
 		{
@@ -129,51 +175,9 @@ void Widget::focus_out()
 	state &= ~FOCUS;
 }
 
-void Widget::update_style()
-{
-	Widget *top;
-	for(top=this; top->parent; top=top->parent) ;
-	Root *root = dynamic_cast<Root *>(top);
-	if(!root)
-		style = 0;
-	else
-	{
-		string sname = get_class();
-		if(!style_name.empty())
-		{
-			sname += '-';
-			sname += style_name;
-		}
-
-		style = root->get_resources().get<Style>(sname);
-	}
-
-	on_style_change();
-}
-
-void Widget::update_style(Widget &w)
-{
-	w.update_style();
-}
-
-void Widget::set_parent(Container *p)
-{
-	if(parent && p)
-		throw InvalidState("Widget is already in a Container");
-	parent = p;
-
-	on_reparent();
-	update_style();
-}
-
-void Widget::set_parent(Widget &w, Container *p)
-{
-	w.set_parent(p);
-}
-
 
 Widget::Loader::Loader(Widget &w):
-	wdg(w)
+	DataFile::ObjectLoader<Widget>(w)
 {
 	add("position", &Loader::position);
 	add("size",     &Loader::size);
@@ -183,17 +187,17 @@ Widget::Loader::Loader(Widget &w):
 
 void Widget::Loader::position(int x, int y)
 {
-	wdg.set_position(x, y);
+	obj.set_position(x, y);
 }
 
 void Widget::Loader::size(unsigned w, unsigned h)
 {
-	wdg.set_size(w, h);
+	obj.set_size(w, h);
 }
 
 void Widget::Loader::style(const string &s)
 {
-	wdg.set_style(s);
+	obj.set_style(s);
 }
 
 } // namespace GLtk