Pass coordinates relative to the receiving widget's geometry

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

diff --git a/source/widget.cpp b/source/widget.cpp
index e20ea82b56fcf085a2cab9a8eb7a1e0e96aaad19..7d608f2ce8d32980505f3fde37e8df91a3bb35de 100644 (file)
--- 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 "panel.h"
 #include "resources.h"
 #include "widget.h"
 
@@ -19,24 +20,34 @@ Widget::Widget(const Resources &r):
        res(r),
        style(0),
        state(NORMAL),
-       visible(true)
+       visible(true),
+       parent(0)
 { }
 
+Widget::~Widget()
+{
+       if(parent)
+               parent->remove(*this);
+}
+
 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)
@@ -45,6 +56,17 @@ 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)
@@ -53,15 +75,15 @@ void Widget::render() const
        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();
@@ -72,13 +94,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();
@@ -98,6 +123,21 @@ void Widget::update_style()
                sname+=style_name;
        }
        style=res.get<Style>(sname);
+       on_style_change();
+}
+
+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)
+{
+       w.set_parent(p);
 }