X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fwidget.cpp;h=3d3b0068ad6f394b905d8e6854dafdfeebf9769e;hb=baa066405c5a9e6a34ce5df962bcce7e7e8d319a;hp=b10b6b560d8226cd9e1ddd68cef905e7189cc0bf;hpb=2accd84fb2f8cc96efea8b3f27e381c2d2749160;p=libs%2Fgltk.git

diff --git a/source/widget.cpp b/source/widget.cpp
index b10b6b5..3d3b006 100644
--- a/source/widget.cpp
+++ b/source/widget.cpp
@@ -1,6 +1,4 @@
-#include <msp/gl/immediate.h>
 #include <msp/gl/matrix.h>
-#include <msp/gl/transform.h>
 #include <msp/strings/format.h>
 #include "container.h"
 #include "resources.h"
@@ -32,28 +30,29 @@ Widget::~Widget()
 
 void Widget::set_position(int x, int y)
 {
-	geom.x = x;
-	geom.y = y;
-	on_geometry_change();
+	set_geometry(Geometry(x, y, geom.w, geom.h));
 }
 
 void Widget::set_size(unsigned w, unsigned h)
 {
-	geom.w = w;
-	geom.h = h;
-	on_geometry_change();
+	set_geometry(Geometry(geom.x, geom.y, w, h));
 }
 
 void Widget::autosize()
 {
+	if(!style)
+		return;
+
 	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);
+			const Geometry &pgeom = i->get_geometry();
+			const Sides &pmargin = i->get_margin();
+			geom.w = max(geom.w, pgeom.w+pmargin.left+pmargin.right);
+			geom.h = max(geom.h, pgeom.h+pmargin.top+pmargin.bottom);
 		}
 }
 
@@ -61,6 +60,7 @@ void Widget::set_geometry(const Geometry &g)
 {
 	geom = g;
 	on_geometry_change();
+	rebuild();
 }
 
 void Widget::set_parent(Container *p)
@@ -69,10 +69,20 @@ void Widget::set_parent(Container *p)
 		throw hierarchy_error("widget already parented");
 	else if(p==parent)
 		return;
-	parent = p;
 
-	on_reparent();
-	update_style();
+	try
+	{
+		parent = p;
+
+		on_reparent();
+		update_style();
+	}
+	catch(...)
+	{
+		// The container has not yet added the widget as its child
+		parent = 0;
+		throw;
+	}
 }
 
 void Widget::set_style(const string &s)
@@ -102,6 +112,7 @@ void Widget::update_style()
 
 	on_style_change();
 	signal_autosize_changed.emit();
+	rebuild();
 }
 
 void Widget::set_tooltip(const string &t)
@@ -137,27 +148,46 @@ void Widget::set_focus()
 void Widget::set_state(State mask, State bits)
 {
 	state = (state&~mask)|bits;
+	rebuild();
 }
 
-void Widget::render() const
+void Widget::rebuild()
 {
 	if(!style)
-		throw logic_error(format("Attempt to render a widget with null style (class=\"%s\", style_name=\"%s\")", get_class(), style_name));
+		return;
 
-	GL::push_matrix();
-	GL::translate(geom.x, geom.y, 0);
 	const Style::PartSeq &parts = style->get_parts();
-	for(Style::PartSeq::const_iterator i=parts.begin(); i!=parts.end(); ++i)
+	list<CachedPart>::iterator j = cached_parts.begin();
+	for(Style::PartSeq::const_iterator i=parts.begin(); i!=parts.end(); ++i, ++j)
 	{
+		if(j==cached_parts.end())
+			j = cached_parts.insert(j, CachedPart());
 		if(i->get_name().empty())
+			i->build(geom, state, *j);
+		else
+			rebuild_special(*i, *j);
+	}
+}
+
+void Widget::render(GL::Renderer &renderer) const
+{
+	if(!style)
+		throw logic_error(format("Attempt to render a widget with null style (class=\"%s\", style_name=\"%s\")", get_class(), style_name));
+
+	GL::MatrixStack::Push _pushm(renderer.matrix_stack());
+	renderer.matrix_stack() *= GL::Matrix::translation(geom.x, geom.y, 0);
+	const Style::PartSeq &parts = style->get_parts();
+	list<CachedPart>::const_iterator j = cached_parts.begin();
+	for(Style::PartSeq::const_iterator i=parts.begin(); (i!=parts.end() && j!=cached_parts.end()); ++i, ++j)
+	{
+		if(j->mesh && j->texture)
 		{
-			GL::PushMatrix push_;
-			i->render(geom, state);
+			renderer.set_texture(j->texture);
+			j->mesh->draw(renderer);
 		}
-		else
-			render_special(*i);
+		else if(!i->get_name().empty())
+			render_special(*i, renderer);
 	}
-	GL::pop_matrix();
 }
 
 void Widget::pointer_enter()