Enable loading of entry widgets from datafiles

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

diff --git a/source/widget.cpp b/source/widget.cpp
index e41310a50c5fd5cba82298dd3149983b16a0f8a1..2eade3913f4d9c9e4530675657873ee080a2d265 100644 (file)
--- a/source/widget.cpp
+++ b/source/widget.cpp
@@ -53,6 +53,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)
@@ -61,15 +72,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();
@@ -80,13 +91,15 @@ 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);
+       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-font->get_descent()*font_size, 0);
        GL::scale_uniform(font_size);
 
        const GL::Color &color=style->get_font_color();