X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fwidget.cpp;h=04c272a136242cea7b14e9adf1988da22fc9cf09;hb=c72566cd7f8252eb386c753ceeafa8a324d1120b;hp=2eade3913f4d9c9e4530675657873ee080a2d265;hpb=ed9873ba7ee862ad76937f579fe371c1a27d5715;p=libs%2Fgltk.git

diff --git a/source/widget.cpp b/source/widget.cpp
index 2eade39..04c272a 100644
--- a/source/widget.cpp
+++ b/source/widget.cpp
@@ -1,12 +1,14 @@
 /* $Id$
 
 This file is part of libmspgltk
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
+Copyright © 2007-2009  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
+#include <msp/gl/immediate.h>
 #include <msp/gl/matrix.h>
 #include <msp/gl/transform.h>
+#include <msp/strings/formatter.h>
 #include "panel.h"
 #include "resources.h"
 #include "widget.h"
@@ -21,6 +23,7 @@ Widget::Widget(const Resources &r):
 	style(0),
 	state(NORMAL),
 	visible(true),
+	focusable(true),
 	parent(0)
 { }
 
@@ -34,17 +37,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,6 +59,11 @@ void Widget::set_style(const string &s)
 	update_style();
 }
 
+void Widget::set_tooltip(const string &t)
+{
+	tooltip = t;
+}
+
 void Widget::set_visible(bool v)
 {
 	if(v==visible)
@@ -60,54 +71,62 @@ void Widget::set_visible(bool v)
 
 	visible=v;
 
-	if(!visible && parent)
-		parent->child_hidden(*this);
+	signal_visibility_changed.emit(visible);
+}
+
+void Widget::set_focusable(bool f)
+{
+	focusable=f;
+}
+
+void Widget::set_focus()
+{
+	if(!parent)
+		throw InvalidState("No parent");
+	if(!visible)
+		throw InvalidState("Can't set focus on invisible widget");
+
+	signal_request_focus.emit();
 }
 
 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)
 	{
 		if(i->get_name().empty())
-			render_graphic(*i);
+		{
+			GL::PushMatrix push_;
+			i->render(geom, state);
+		}
 		else
 			render_special(*i);
 	}
 	GL::pop_matrix();
 }
 
-void Widget::render_graphic(const Part &part) const
+void Widget::pointer_enter()
 {
-	GL::push_matrix();
-	part.render(geom, state);
-	GL::pop_matrix();
+	state|=HOVER;
 }
 
-void Widget::render_text(const Part &part, const string &text) const
+void Widget::pointer_leave()
 {
-	const GL::Font *const font=style->get_font();
-	const float font_size=font->get_default_size();
-
-	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);
-	part.get_alignment().apply(rgeom, geom, part.get_margin());
-
-	GL::push_matrix();
-	GL::translate(rgeom.x, rgeom.y-font->get_descent()*font_size, 0);
-	GL::scale_uniform(font_size);
+	state&=~HOVER;
+}
 
-	const GL::Color &color=style->get_font_color();
-	glColor3f(color.r, color.g, color.b);
-	font->draw_string(text);
-	glColor3f(1, 1, 1);
+void Widget::focus_in()
+{
+	state|=FOCUS;
+}
 
-	GL::pop_matrix();
+void Widget::focus_out()
+{
+	state&=~FOCUS;
 }
 
 void Widget::update_style()
@@ -119,16 +138,19 @@ void Widget::update_style()
 		sname+=style_name;
 	}
 	style=res.get<Style>(sname);
+	on_style_change();
 }
 
-void Widget::set_parent(Panel *p)
+void Widget::set_parent(Container *p)
 {
 	if(parent && p)
-		throw InvalidState("Widget is already in a Panel");
+		throw InvalidState("Widget is already in a Container");
 	parent=p;
+
+	on_reparent();
 }
 
-void Widget::set_parent(Widget &w, Panel *p)
+void Widget::set_parent(Widget &w, Container *p)
 {
 	w.set_parent(p);
 }