Add a VSlider to multiline Entries

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

diff --git a/source/button.cpp b/source/button.cpp
index ec9901620d5d562ffd3b820316f69c0c2f829d44..5871a5fabd0c7db23b2a0dfea1a5c6e6902f0368 100644 (file)
--- a/source/button.cpp
+++ b/source/button.cpp
@@ -14,29 +14,30 @@ namespace GLtk {
 
 Button::Button(const Resources &r, const std::string &t):
        Widget(r),
+       text(),
        icon(0),
        pressed(false)
 {
-       set_text(t);
        update_style();
+       set_text(t);
 }
 
 void Button::set_text(const std::string &t)
 {
-       text=t;
+       text = t;
 }
 
 void Button::set_icon(const GL::Texture2D *i)
 {
-       icon=i;
+       icon = i;
 }
 
 void Button::button_press(int, int, unsigned btn)
 {
        if(btn==1)
        {
-               pressed=true;
-               state|=ACTIVE;
+               pressed = true;
+               state |= ACTIVE;
        }
 }
 
@@ -44,11 +45,11 @@ void Button::button_release(int x, int y, unsigned btn)
 {
        if(pressed && btn==1)
        {
+               state &= ~ACTIVE;
+               pressed = false;
+
                if(geom.is_inside_relative(x, y))
                        signal_clicked.emit();
-               
-               state&=~ACTIVE;
-               pressed=false;
        }
 }
 
@@ -57,21 +58,21 @@ void Button::pointer_motion(int x, int y)
        if(pressed)
        {
                if(!geom.is_inside_relative(x, y))
-                       state&=~ACTIVE;
+                       state &= ~ACTIVE;
                else
-                       state|=ACTIVE;
+                       state |= ACTIVE;
        }
 }
 
 void Button::render_special(const Part &part) const
 {
        if(part.get_name()=="text")
-               render_text(part, text);
+               text.render(part, geom);
        if(part.get_name()=="icon" && icon)
        {
                Geometry rgeom;
-               rgeom.w=icon->get_width();
-               rgeom.h=icon->get_height();
+               rgeom.w = icon->get_width();
+               rgeom.h = icon->get_height();
                part.get_alignment().apply(rgeom, geom, part.get_margin());
 
                icon->bind();
@@ -91,16 +92,21 @@ void Button::render_special(const Part &part) const
        }
 }
 
+void Button::on_style_change()
+{
+       text.set_style(style);
+}
+
 
 Button::Loader::Loader(Button &btn):
        Widget::Loader(btn)
 {
-       add("text", &Button::text);
+       add("text", &Loader::text);
 }
 
-Button &Button::Loader::get_object() const
+void Button::Loader::text(const std::string &t)
 {
-       return static_cast<Button &>(wdg);
+       static_cast<Button &>(wdg).text = t;
 }
 
 } // namespace GLtk