Make autosize_special const and add a const autosize overload

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

diff --git a/source/toggle.cpp b/source/toggle.cpp
index fe6518dda722b57fc6ffda3c2481d4e42ae63047..b597eb99d32ad73eb02123e2fa83429d7836977f 100644 (file)
--- a/source/toggle.cpp
+++ b/source/toggle.cpp
@@ -17,7 +17,7 @@ Toggle::Toggle(const string &t):
        set_text(t);
 }
 
-void Toggle::autosize_special(const Part &part, Geometry &ageom)
+void Toggle::autosize_special(const Part &part, Geometry &ageom) const
 {
        if(part.get_name()=="text")
                text.autosize(part, ageom);
@@ -48,6 +48,8 @@ void Toggle::exclude_siblings()
 
 void Toggle::set_value(bool v)
 {
+       bool old_value = value;
+
        value = v;
        if(value)
        {
@@ -57,12 +59,15 @@ void Toggle::set_value(bool v)
        }
        else
                clear_state(ACTIVE);
+
+       if(value!=old_value)
+               signal_toggled.emit(value);
 }
 
 void Toggle::rebuild_special(const Part &part)
 {
        if(part.get_name()=="text")
-               text.build(part, geom, part_cache);
+               text.build(part, state, geom, part_cache);
 }
 
 void Toggle::button_press(int, int, unsigned btn)
@@ -76,10 +81,7 @@ void Toggle::button_release(int x, int y, unsigned btn)
        if(pressed && btn==1)
        {
                if(geom.is_inside_relative(x, y) && (!value || !exclusive))
-               {
                        set_value(!value);
-                       signal_toggled.emit(value);
-               }
 
                pressed = false;
        }