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 43acaa3125b021161a489f91ab9603a044a7ec95..b597eb99d32ad73eb02123e2fa83429d7836977f 100644 (file)
--- a/source/toggle.cpp
+++ b/source/toggle.cpp
@@ -1,12 +1,6 @@
-/* $Id$
-
-This file is part of libmspgltk
-Copyright © 2007-2011  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include "panel.h"
 #include "part.h"
+#include "style.h"
 #include "toggle.h"
 
 using namespace std;
@@ -23,9 +17,17 @@ Toggle::Toggle(const string &t):
        set_text(t);
 }
 
+void Toggle::autosize_special(const Part &part, Geometry &ageom) const
+{
+       if(part.get_name()=="text")
+               text.autosize(part, ageom);
+}
+
 void Toggle::set_text(const string &t)
 {
        text = t;
+       signal_autosize_changed.emit();
+       rebuild();
 }
 
 void Toggle::set_exclusive(bool e)
@@ -46,21 +48,26 @@ void Toggle::exclude_siblings()
 
 void Toggle::set_value(bool v)
 {
+       bool old_value = value;
+
        value = v;
        if(value)
        {
-               state |= ACTIVE;
+               set_state(ACTIVE);
                if(exclusive && parent)
                        exclude_siblings();
        }
        else
-               state &= ~ACTIVE;
+               clear_state(ACTIVE);
+
+       if(value!=old_value)
+               signal_toggled.emit(value);
 }
 
-void Toggle::render_special(const Part &part) const
+void Toggle::rebuild_special(const Part &part)
 {
        if(part.get_name()=="text")
-               text.render(part, geom);
+               text.build(part, state, geom, part_cache);
 }
 
 void Toggle::button_press(int, int, unsigned btn)
@@ -74,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;
        }
@@ -90,30 +94,21 @@ void Toggle::on_style_change()
 
 
 Toggle::Loader::Loader(Toggle &t):
-       Widget::Loader(t)
+       DataFile::DerivedObjectLoader<Toggle, Widget::Loader>(t)
 {
        add("exclusive", &Toggle::exclusive);
        add("text",      &Loader::text);
        add("value",     &Toggle::value);
 }
 
-Toggle &Toggle::Loader::get_object() const
-{
-       return static_cast<Toggle &>(obj);
-}
-
 void Toggle::Loader::finish()
 {
-       Toggle &tgl = get_object();
-       if(tgl.value)
-               tgl.state |= ACTIVE;
-       else
-               tgl.state &= ~ACTIVE;
+       obj.set_state(ACTIVE, (obj.value ? ACTIVE : NORMAL));
 }
 
 void Toggle::Loader::text(const string &t)
 {
-       get_object().text = t;
+       obj.text = t;
 }
 
 } // namespace GLtk