X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fwidget.cpp;h=0128367c2b32a6a6c54ae458b3d3a994b38cdf2e;hb=48fd4db84c4d0b43305d85f74de99eb4fef04fd6;hp=e41310a50c5fd5cba82298dd3149983b16a0f8a1;hpb=2f1c7d6861c801e24a003ee5f6132032e04c9bbe;p=libs%2Fgltk.git

diff --git a/source/widget.cpp b/source/widget.cpp
index e41310a..0128367 100644
--- a/source/widget.cpp
+++ b/source/widget.cpp
@@ -7,6 +7,7 @@ Distributed under the LGPL
 
 #include <msp/gl/matrix.h>
 #include <msp/gl/transform.h>
+#include <msp/strings/formatter.h>
 #include "panel.h"
 #include "resources.h"
 #include "widget.h"
@@ -34,17 +35,20 @@ void Widget::set_position(int x, int y)
 {
 	geom.x=x;
 	geom.y=y;
+	on_geometry_change();
 }
 
 void Widget::set_size(unsigned w, unsigned h)
 {
 	geom.w=w;
 	geom.h=h;
+	on_geometry_change();
 }
 
 void Widget::set_geometry(const Geometry &g)
 {
 	geom=g;
+	on_geometry_change();
 }
 
 void Widget::set_style(const string &s)
@@ -53,23 +57,34 @@ void Widget::set_style(const string &s)
 	update_style();
 }
 
+void Widget::set_visible(bool v)
+{
+	if(v==visible)
+		return;
+
+	visible=v;
+
+	if(!visible && parent)
+		parent->child_hidden(*this);
+}
+
 void Widget::render() const
 {
 	if(!style)
-		throw InvalidState("Attempt to render a widget without a style");
+		throw InvalidState(format("Attempt to render a widget without a style (class=\"%s\")", get_class()));
 
 	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)
-		render_part(*i);
+	{
+		if(i->get_name().empty())
+			render_graphic(*i);
+		else
+			render_special(*i);
+	}
 	GL::pop_matrix();
 }
 
-void Widget::render_part(const Part &part) const
-{
-	render_graphic(part);
-}
-
 void Widget::render_graphic(const Part &part) const
 {
 	GL::push_matrix();
@@ -80,13 +95,16 @@ void Widget::render_graphic(const Part &part) const
 void Widget::render_text(const Part &part, const string &text) const
 {
 	const GL::Font *const font=style->get_font();
-
 	const float font_size=font->get_default_size();
-	unsigned text_w=static_cast<unsigned>(font->get_string_width(text)*font_size);
 
-	GL::push_matrix();
+	Geometry rgeom;
+	rgeom.w=static_cast<unsigned>(font->get_string_width(text)*font_size);
+	rgeom.h=static_cast<unsigned>((font->get_ascent()-font->get_descent())*font_size);
+	rgeom.y=static_cast<int>(-font->get_descent()*font_size);
+	part.get_alignment().apply(rgeom, geom, part.get_margin());
 
-	part.get_alignment().apply(geom, text_w, static_cast<unsigned>(font->get_ascent()*font_size));
+	GL::push_matrix();
+	GL::translate(rgeom.x, rgeom.y, 0);
 	GL::scale_uniform(font_size);
 
 	const GL::Color &color=style->get_font_color();
@@ -106,6 +124,7 @@ void Widget::update_style()
 		sname+=style_name;
 	}
 	style=res.get<Style>(sname);
+	on_style_change();
 }
 
 void Widget::set_parent(Panel *p)
@@ -113,6 +132,8 @@ void Widget::set_parent(Panel *p)
 	if(parent && p)
 		throw InvalidState("Widget is already in a Panel");
 	parent=p;
+
+	on_reparent();
 }
 
 void Widget::set_parent(Widget &w, Panel *p)