X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fwidget.cpp;h=4b48e8ba11400d2f410790de92b8464e890b68b3;hb=1aa6cd9b865e366737dcc9d2d36c4f8faed5bc4f;hp=e929940f46655d97e98af351bece30151b0e7317;hpb=e5f9004b672b038e43cf2b20c3fc9327f2b55ffd;p=libs%2Fgltk.git

diff --git a/source/widget.cpp b/source/widget.cpp
index e929940..4b48e8b 100644
--- a/source/widget.cpp
+++ b/source/widget.cpp
@@ -1,7 +1,5 @@
-#include <msp/gl/immediate.h>
 #include <msp/gl/matrix.h>
-#include <msp/gl/transform.h>
-#include <msp/strings/formatter.h>
+#include <msp/strings/format.h>
 #include "container.h"
 #include "resources.h"
 #include "root.h"
@@ -35,6 +33,7 @@ void Widget::set_position(int x, int y)
 	geom.x = x;
 	geom.y = y;
 	on_geometry_change();
+	rebuild();
 }
 
 void Widget::set_size(unsigned w, unsigned h)
@@ -42,6 +41,7 @@ void Widget::set_size(unsigned w, unsigned h)
 	geom.w = w;
 	geom.h = h;
 	on_geometry_change();
+	rebuild();
 }
 
 void Widget::autosize()
@@ -61,6 +61,7 @@ void Widget::set_geometry(const Geometry &g)
 {
 	geom = g;
 	on_geometry_change();
+	rebuild();
 }
 
 void Widget::set_parent(Container *p)
@@ -102,6 +103,7 @@ void Widget::update_style()
 
 	on_style_change();
 	signal_autosize_changed.emit();
+	rebuild();
 }
 
 void Widget::set_tooltip(const string &t)
@@ -134,45 +136,69 @@ void Widget::set_focus()
 	signal_request_focus.emit();
 }
 
+void Widget::set_state(State mask, State bits)
+{
+	state = (state&~mask)|bits;
+	rebuild();
+}
+
+void Widget::rebuild()
+{
+	if(!style)
+		return;
+
+	const Style::PartSeq &parts = style->get_parts();
+	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() 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::push_matrix();
-	GL::translate(geom.x, geom.y, 0);
+	GL::MatrixStack::Push _pushm(GL::MatrixStack::modelview());
+	GL::MatrixStack::modelview() *= GL::Matrix::translation(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>::const_iterator j = cached_parts.begin();
+	for(Style::PartSeq::const_iterator i=parts.begin(); (i!=parts.end() && j!=cached_parts.end()); ++i, ++j)
 	{
-		if(i->get_name().empty())
+		if(j->mesh && j->texture)
 		{
-			GL::PushMatrix push_;
-			i->render(geom, state);
+			GL::Bind bind_tex(j->texture);
+			j->mesh->draw();
 		}
-		else
+		else if(!i->get_name().empty())
 			render_special(*i);
 	}
-	GL::pop_matrix();
 }
 
 void Widget::pointer_enter()
 {
-	state |= HOVER;
+	set_state(HOVER);
 }
 
 void Widget::pointer_leave()
 {
-	state &= ~HOVER;
+	clear_state(HOVER);
 }
 
 void Widget::focus_in()
 {
-	state |= FOCUS;
+	set_state(FOCUS);
 }
 
 void Widget::focus_out()
 {
-	state &= ~FOCUS;
+	clear_state(FOCUS);
 }