Update text information when widget style changes

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

diff --git a/source/widget.cpp b/source/widget.cpp
index 84d042573ec18aff63230eca34cada3e150dbab3..04c272a136242cea7b14e9adf1988da22fc9cf09 100644 (file)
--- a/source/widget.cpp
+++ b/source/widget.cpp
@@ -23,6 +23,7 @@ Widget::Widget(const Resources &r):
        style(0),
        state(NORMAL),
        visible(true),
+       focusable(true),
        parent(0)
 { }
 
@@ -58,6 +59,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)
@@ -68,6 +74,11 @@ void Widget::set_visible(bool v)
        signal_visibility_changed.emit(visible);
 }
 
+void Widget::set_focusable(bool f)
+{
+       focusable=f;
+}
+
 void Widget::set_focus()
 {
        if(!parent)
@@ -88,43 +99,16 @@ void Widget::render() const
        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);
+               }
                else
                        render_special(*i);
        }
        GL::pop_matrix();
 }
 
-void Widget::render_graphic(const Part &part) const
-{
-       GL::push_matrix();
-       part.render(geom, state);
-       GL::pop_matrix();
-}
-
-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();
-
-       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, 0);
-       GL::scale_uniform(font_size);
-
-       const GL::Color &color=style->get_font_color();
-       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;