X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=inline;f=source%2Fwidget.cpp;h=c146d235c80602e061a02dd8d7a6ef832f507102;hb=2f70d404230954f0693a62a021b5d2ad1faed8fa;hp=2af3b60b3024a96e5689637ed152e152b2eec275;hpb=0af3c2393bd00f39db3bfaf5b78a7a44f0fd5ff1;p=libs%2Fgltk.git

diff --git a/source/widget.cpp b/source/widget.cpp
index 2af3b60..c146d23 100644
--- a/source/widget.cpp
+++ b/source/widget.cpp
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of libmspgltk
-Copyright © 2007-2009  Mikko Rasa, Mikkosoft Productions
+Copyright © 2007-2011  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
@@ -9,8 +9,9 @@ Distributed under the LGPL
 #include <msp/gl/matrix.h>
 #include <msp/gl/transform.h>
 #include <msp/strings/formatter.h>
-#include "panel.h"
+#include "container.h"
 #include "resources.h"
+#include "root.h"
 #include "widget.h"
 
 using namespace std;
@@ -18,8 +19,7 @@ using namespace std;
 namespace Msp {
 namespace GLtk {
 
-Widget::Widget(const Resources &r):
-	res(r),
+Widget::Widget():
 	style(0),
 	state(NORMAL),
 	visible(true),
@@ -53,12 +53,44 @@ void Widget::set_geometry(const Geometry &g)
 	on_geometry_change();
 }
 
+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_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();
+}
+
 void Widget::set_tooltip(const string &t)
 {
 	tooltip = t;
@@ -92,11 +124,12 @@ void Widget::set_focus()
 void Widget::render() const
 {
 	if(!style)
-		throw InvalidState(format("Attempt to render a widget without a style (class=\"%s\")", get_class()));
+		throw InvalidState(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,32 +162,6 @@ void Widget::focus_out()
 	state &= ~FOCUS;
 }
 
-void Widget::update_style()
-{
-	string sname = get_class();
-	if(!style_name.empty())
-	{
-		sname += '-';
-		sname += style_name;
-	}
-	style = res.get<Style>(sname);
-	on_style_change();
-}
-
-void Widget::set_parent(Container *p)
-{
-	if(parent && p)
-		throw InvalidState("Widget is already in a Container");
-	parent = p;
-
-	on_reparent();
-}
-
-void Widget::set_parent(Widget &w, Container *p)
-{
-	w.set_parent(p);
-}
-
 
 Widget::Loader::Loader(Widget &w):
 	wdg(w)