Simplify constructors with C++11

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

diff --git a/source/button.cpp b/source/button.cpp
index 58fc134cde2a9d551c80ad9b303bcd7773423304..0dd20c7a6abb841cd4d2f9e98d1b75030d912d98 100644 (file)
--- a/source/button.cpp
+++ b/source/button.cpp
@@ -8,15 +8,13 @@ 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_special(const Part &part, Geometry &ageom)
+void Button::autosize_special(const Part &part, Geometry &ageom) const
 {
        if(part.get_name()=="text")
                text.autosize(part, ageom);
@@ -32,19 +30,19 @@ 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)
 {
        if(part.get_name()=="text")
-               text.build(part, geom, part_cache);
+               text.build(part, state, geom, part_cache);
        if(part.get_name()=="icon")
        {
                if(icon)
@@ -56,15 +54,15 @@ void Button::rebuild_special(const Part &part)
 
                        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();
                }
        }
@@ -102,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);