Clear focus in Panel if focused child is removed

[libs/gltk.git] / source / widget.cpp

diff --git a/source/widget.cpp b/source/widget.cpp
index 2eade3913f4d9c9e4530675657873ee080a2d265..efb6155ef4a51d8fb4e69bde95323ea4e10c250d 100644 (file)
--- 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"
@@ -34,17 +36,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)
@@ -67,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);
@@ -96,20 +101,41 @@ void Widget::render_text(const Part &part, const string &text) const
        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());
 
        GL::push_matrix();
-       GL::translate(rgeom.x, rgeom.y-font->get_descent()*font_size, 0);
+       GL::translate(rgeom.x, rgeom.y, 0);
        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();
@@ -119,6 +145,7 @@ void Widget::update_style()
                sname+=style_name;
        }
        style=res.get<Style>(sname);
+       on_style_change();
 }
 
 void Widget::set_parent(Panel *p)
@@ -126,6 +153,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)