Change State into a bitmask to allow more fine-grained control of styles

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

diff --git a/source/button.cpp b/source/button.cpp
index f078ca6fcae2420ed88bdc8b41e32d786366d08e..20e0ed9241d616a36c2a1f154358931f8d92acf3 100644 (file)
--- a/source/button.cpp
+++ b/source/button.cpp
@@ -12,7 +12,8 @@ namespace Msp {
 namespace GLtk {
 
 Button::Button(const Resources &r, const std::string &t):
-       Widget(r)
+       Widget(r),
+       pressed(false)
 {
        set_text(t);
        update_style();
@@ -23,42 +24,37 @@ void Button::set_text(const std::string &t)
        text=t;
 }
 
-void Button::button_press(int x, int y, unsigned btn)
+void Button::button_press(int, int, unsigned btn)
 {
-       if(geom.is_inside(x, y) && btn==1)
-               state=ACTIVE;
+       if(btn==1)
+       {
+               pressed=true;
+               state|=ACTIVE;
+       }
 }
 
 void Button::button_release(int x, int y, unsigned btn)
 {
-       if(btn==1)
+       if(pressed && btn==1)
        {
-               if(geom.is_inside(x, y))
-               {
+               if(geom.is_inside_relative(x, y))
                        signal_clicked.emit();
-                       state=HOVER;
-               }
-               else
-                       state=NORMAL;
+               
+               state&=~ACTIVE;
+               pressed=false;
        }
 }
 
-void Button::pointer_enter()
-{
-       state=HOVER;
-}
-
 void Button::pointer_leave()
 {
-       state=NORMAL;
+       Widget::pointer_leave();
+       state&=~ACTIVE;
 }
 
-void Button::render_part(const Part &part) const
+void Button::render_special(const Part &part) const
 {
        if(part.get_name()=="text")
                render_text(part, text);
-       else
-               Widget::render_part(part);
 }