Use a GL::Renderer to render widgets

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

diff --git a/source/dropdown.cpp b/source/dropdown.cpp
index 87ea5eece9cc7fcbe8341284a289fce8612ed434..41e42fa72fa4b45b399ede99167d3a45d0bbe869 100644 (file)
--- a/source/dropdown.cpp
+++ b/source/dropdown.cpp
@@ -31,11 +31,13 @@ void Dropdown::autosize()
        if(const Part *text_part = style->get_part("text"))
        {
                const Sides &margin = text_part->get_margin();
-               const GL::Font *font = style->get_font();
-               float font_size = font->get_default_size();
-               unsigned line_height = static_cast<unsigned>((font->get_ascent()-font->get_descent())*font_size);
+               const GL::Font &font = style->get_font();
+               float font_size = style->get_font_size();
+               unsigned line_height = static_cast<unsigned>((font.get_ascent()-font.get_descent())*font_size);
                geom.h = max(geom.h, line_height+margin.top+margin.bottom);
        }
+
+       rebuild();
 }
 
 void Dropdown::append(const string &item)
@@ -78,15 +80,21 @@ int Dropdown::get_selected_index() const
        return list.get_selected_index();
 }
 
-void Dropdown::render_special(const Part &part) const
+void Dropdown::rebuild_special(const Part &part, CachedPart &cache)
 {
        if(part.get_name()=="text")
        {
                if(list.get_selected_index()>=0)
-                       Text(*style, list.get_selected()).render(part, geom);
+                       Text(*style, list.get_selected()).build(part, geom, cache);
+               else
+                       cache.texture = 0;
        }
-       else if(part.get_name()=="list" && dropped)
-               list.render();
+}
+
+void Dropdown::render_special(const Part &part, GL::Renderer &renderer) const
+{
+       if(part.get_name()=="list" && dropped)
+               list.render(renderer);
 }
 
 void Dropdown::button_press(int x, int y, unsigned btn)
@@ -97,14 +105,14 @@ void Dropdown::button_press(int x, int y, unsigned btn)
                if(!click_focus)
                {
                        dropped = false;
-                       state &= ~ACTIVE;
+                       clear_state(ACTIVE);
                        signal_ungrab_pointer.emit();
                }
        }
        else if(btn==1)
        {
                dropped = true;
-               state |= ACTIVE;
+               set_state(ACTIVE);
                signal_grab_pointer.emit();
        }
 }
@@ -160,7 +168,7 @@ void Dropdown::list_item_selected(unsigned index, const std::string &item)
        if(dropped)
        {
                dropped = false;
-               state &= ~ACTIVE;
+               clear_state(ACTIVE);
                signal_ungrab_pointer.emit();
        }