Rework how widget ownership works in Container

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

diff --git a/source/button.cpp b/source/button.cpp
index b881b3f97fd8b52394b2e6bf9be1bd9869621598..0dd20c7a6abb841cd4d2f9e98d1b75030d912d98 100644 (file)
--- a/source/button.cpp
+++ b/source/button.cpp
@@ -8,61 +8,43 @@ using namespace std;
 namespace Msp {
 namespace GLtk {
 
-Button::Button(const std::string &t):
-       text(),
-       icon(0),
-       pressed(false)
+Button::Button(const std::string &t)
 {
+       input_type = INPUT_NAVIGATION;
        set_text(t);
 }
 
-void Button::autosize()
+void Button::autosize_special(const Part &part, Geometry &ageom) const
 {
-       if(!style)
-               return;
-
-       Widget::autosize();
-
-       if(const Part *text_part = style->get_part("text"))
+       if(part.get_name()=="text")
+               text.autosize(part, ageom);
+       else if(part.get_name()=="icon" && icon)
        {
-               const Sides &margin = text_part->get_margin();
-               geom.w = max(geom.w, text.get_width()+margin.left+margin.right);
-               geom.h = max(geom.h, text.get_height()+margin.top+margin.bottom);
+               const Sides &margin = part.get_margin();
+               ageom.w = max(ageom.w, icon->get_width()+margin.left+margin.right);
+               ageom.h = max(ageom.h, icon->get_height()+margin.top+margin.bottom);
        }
-
-       if(icon)
-       {
-               if(const Part *icon_part = style->get_part("icon"))
-               {
-                       const Sides &margin = icon_part->get_margin();
-                       geom.w = max(geom.w, icon->get_width()+margin.left+margin.right);
-                       geom.h = max(geom.h, icon->get_height()+margin.top+margin.bottom);
-               }
-       }
-
-       rebuild();
 }
 
 void Button::set_text(const std::string &t)
 {
        text = t;
        signal_autosize_changed.emit();
-       rebuild();
+       mark_rebuild();
 }
 
 void Button::set_icon(const GL::Texture2D *i)
 {
        icon = i;
-       rebuild();
+       mark_rebuild();
 }
 
-void Button::rebuild_special(const Part &part, CachedPart &cache)
+void Button::rebuild_special(const Part &part)
 {
        if(part.get_name()=="text")
-               text.build(part, geom, cache);
+               text.build(part, state, geom, part_cache);
        if(part.get_name()=="icon")
        {
-               cache.texture = icon;
                if(icon)
                {
                        Geometry rgeom;
@@ -70,19 +52,17 @@ void Button::rebuild_special(const Part &part, CachedPart &cache)
                        rgeom.h = icon->get_height();
                        part.get_alignment().apply(rgeom, geom, part.get_margin());
 
-                       cache.clear_mesh();
-
-                       GL::MeshBuilder bld(*cache.mesh);
+                       GL::MeshBuilder bld(part_cache.create_mesh(part, *icon));
                        bld.color(1.0f, 1.0f, 1.0f);
-                       bld.begin(GL::QUADS);
+                       bld.begin(GL::TRIANGLE_STRIP);
+                       bld.texcoord(0, 1);
+                       bld.vertex(rgeom.x, rgeom.y+rgeom.h);
                        bld.texcoord(0, 0);
                        bld.vertex(rgeom.x, rgeom.y);
-                       bld.texcoord(1, 0);
-                       bld.vertex(rgeom.x+rgeom.w, rgeom.y);
                        bld.texcoord(1, 1);
                        bld.vertex(rgeom.x+rgeom.w, rgeom.y+rgeom.h);
-                       bld.texcoord(0, 1);
-                       bld.vertex(rgeom.x, rgeom.y+rgeom.h);
+                       bld.texcoord(1, 0);
+                       bld.vertex(rgeom.x+rgeom.w, rgeom.y);
                        bld.end();
                }
        }
@@ -120,6 +100,16 @@ void Button::pointer_motion(int x, int y)
        }
 }
 
+bool Button::navigate(Navigation nav)
+{
+       if(nav==NAV_ACTIVATE)
+               signal_clicked.emit();
+       else
+               return false;
+
+       return true;
+}
+
 void Button::on_style_change()
 {
        text.set_style(style);