X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fwidget.cpp;h=0181e451e95163f40d67c06fda793dceb554e55b;hb=9f38197854e699a6093a906ab43f4238f3cd2388;hp=246c8c196ced2222237a9f10af93a71fcb114160;hpb=01d30637b393b2f8a932b1d943076db580b1e951;p=libs%2Fgltk.git

diff --git a/source/widget.cpp b/source/widget.cpp
index 246c8c1..0181e45 100644
--- a/source/widget.cpp
+++ b/source/widget.cpp
@@ -10,14 +10,6 @@ using namespace std;
 namespace Msp {
 namespace GLtk {
 
-Widget::Widget():
-	style(0),
-	state(NORMAL),
-	visible(true),
-	input_type(INPUT_NONE),
-	parent(0)
-{ }
-
 Widget::~Widget()
 {
 	if(parent)
@@ -51,18 +43,17 @@ void Widget::autosize(Geometry &ageom) const
 		return;
 
 	ageom = Geometry(geom.x, geom.y, 0, 0);
-	const Style::PartSeq &parts = style->get_parts();
-	for(Style::PartSeq::const_iterator i=parts.begin(); i!=parts.end(); ++i)
+	for(const Part &p: style->get_parts())
 	{
-		if(i->get_name().empty())
+		if(p.get_name().empty())
 		{
-			const Geometry &pgeom = i->get_geometry();
-			const Sides &pmargin = i->get_margin();
+			const Geometry &pgeom = p.get_geometry();
+			const Sides &pmargin = p.get_margin();
 			ageom.w = max(ageom.w, pgeom.w+pmargin.left+pmargin.right);
 			ageom.h = max(ageom.h, pgeom.h+pmargin.top+pmargin.bottom);
 		}
 		else
-			autosize_special(*i, ageom);
+			autosize_special(p, ageom);
 	}
 }
 
@@ -72,9 +63,8 @@ void Widget::set_geometry(const Geometry &g)
 	geom = g;
 	if(size_changed)
 	{
-		// TODO maybe rename this to on_size_change
-		on_geometry_change();
-		rebuild();
+		on_size_change();
+		mark_rebuild();
 	}
 }
 
@@ -93,6 +83,16 @@ void Widget::map_coords_to_ancestor(int &x, int &y, const Widget &ancestor) cons
 	throw hierarchy_error("not an ancestor");
 }
 
+void Widget::map_coords_to_root(int &x, int &y) const
+{
+	for(const Widget *w=this; w; w=w->get_parent())
+	{
+		const Geometry &wgeom = w->get_geometry();
+		x += wgeom.x;
+		y += wgeom.y;
+	}
+}
+
 void Widget::set_parent(Container *p)
 {
 	if(parent && p)
@@ -142,7 +142,7 @@ void Widget::update_style()
 
 	on_style_change();
 	signal_autosize_changed.emit();
-	rebuild();
+	mark_rebuild();
 }
 
 void Widget::set_tooltip(const string &t)
@@ -160,11 +160,6 @@ void Widget::set_visible(bool v)
 	signal_visibility_changed.emit(visible);
 }
 
-void Widget::set_focusable(bool f)
-{
-	input_type = (f ? INPUT_TEXT : INPUT_NONE);
-}
-
 void Widget::set_focus()
 {
 	if(!parent)
@@ -185,7 +180,7 @@ void Widget::set_state(State mask, State bits)
 	State old_state = state;
 	state = (state&~mask)|bits;
 	if(style && style->compare_states(old_state, state))
-		rebuild();
+		mark_rebuild();
 }
 
 void Widget::set_animation_interval(const Time::TimeDelta &iv)
@@ -202,19 +197,36 @@ void Widget::stop_animation()
 	set_animation_interval(Time::zero);
 }
 
+void Widget::mark_rebuild()
+{
+	if(rebuild_needed)
+		return;
+
+	rebuild_needed = true;
+	signal_rebuild_needed.emit();
+}
+
+void Widget::rebuild_hierarchy()
+{
+	if(rebuild_needed)
+	{
+		rebuild_needed = false;
+		rebuild();
+	}
+}
+
 void Widget::rebuild()
 {
 	if(!style)
 		return;
 
 	PartCache::Rebuild rebuild_cache(part_cache);
-	const Style::PartSeq &parts = style->get_parts();
-	for(Style::PartSeq::const_iterator i=parts.begin(); i!=parts.end(); ++i)
+	for(const Part &p: style->get_parts())
 	{
-		if(i->get_name().empty())
-			i->build(geom, state, part_cache);
+		if(p.get_name().empty())
+			p.build(geom, state, part_cache);
 		else
-			rebuild_special(*i);
+			rebuild_special(p);
 	}
 }
 
@@ -228,18 +240,22 @@ 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));
 
+	static const GL::Tag texture_tag("ui_tex");
+
 	GL::Renderer::Push _push(renderer);
-	renderer.transform(GL::Matrix::translation(geom.x, geom.y, 0));
-	const PartCache::PartList &parts = part_cache.get_parts();
-	for(PartCache::PartList::const_iterator i=parts.begin(); i!=parts.end(); ++i)
+	int x = 0;
+	int y = 0;
+	map_coords_to_root(x, y);
+	renderer.set_matrix(GL::Matrix::translation(x, y, 0));
+	for(const CachedPart &p: part_cache.get_parts())
 	{
-		if(i->mesh && i->texture)
+		if(p.mesh && p.texture)
 		{
-			renderer.set_texture(i->texture);
-			i->mesh->draw(renderer);
+			renderer.set_texture(texture_tag, p.texture, &style->get_sampler());
+			p.mesh->draw(renderer);
 		}
-		else if(i->part)
-			render_special(*i->part, renderer);
+		else if(p.part)
+			render_special(*p.part, renderer);
 	}
 }