Bump version to 1.1

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

diff --git a/source/widget.cpp b/source/widget.cpp
index 2eade3913f4d9c9e4530675657873ee080a2d265..7137260a297165442e0554011b0334ef0149a6d1 100644 (file)
--- 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"
@@ -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)
@@ -53,6 +58,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,28 +70,41 @@ void Widget::set_visible(bool v)
 
        visible=v;
 
-       if(!visible && parent)
-               parent->child_hidden(*this);
+       signal_visibility_changed.emit(visible);
+}
+
+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);
+               }
+                       //render_graphic(*i);
                else
                        render_special(*i);
        }
        GL::pop_matrix();
 }
 
-void Widget::render_graphic(const Part &part) const
+/*void Widget::render_graphic(const Part &part) const
 {
        GL::push_matrix();
        part.render(geom, state);
@@ -96,18 +119,39 @@ 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()
@@ -119,16 +163,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);
 }