X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fwidget.cpp;h=efb6155ef4a51d8fb4e69bde95323ea4e10c250d;hb=9b29612d1cde85fee9b3f011e86a5cabe5dbcce3;hp=7d608f2ce8d32980505f3fde37e8df91a3bb35de;hpb=c435423919a20a87d100e1ee4cd1fc6ce223040c;p=libs%2Fgltk.git

diff --git a/source/widget.cpp b/source/widget.cpp
index 7d608f2..efb6155 100644
--- a/source/widget.cpp
+++ b/source/widget.cpp
@@ -5,8 +5,10 @@ Copyright © 2007  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"
@@ -70,7 +72,7 @@ void Widget::set_visible(bool v)
 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);
@@ -107,13 +109,33 @@ void Widget::render_text(const Part &part, const string &text) const
 	GL::scale_uniform(font_size);
 
 	const GL::Color &color=style->get_font_color();
-	glColor3f(color.r, color.g, color.b);
-	font->draw_string(text);
-	glColor3f(1, 1, 1);
+	GL::Immediate imm((GL::COLOR4_UBYTE, GL::TEXCOORD2, GL::VERTEX2));
+	imm.color(color.r, color.g, color.b);
+	font->draw_string(text, imm);
 
 	GL::pop_matrix();
 }
 
+void Widget::pointer_enter()
+{
+	state|=HOVER;
+}
+
+void Widget::pointer_leave()
+{
+	state&=~HOVER;
+}
+
+void Widget::focus_in()
+{
+	state|=FOCUS;
+}
+
+void Widget::focus_out()
+{
+	state&=~FOCUS;
+}
+
 void Widget::update_style()
 {
 	string sname=get_class();