Improve widget part caching

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

diff --git a/source/toggle.cpp b/source/toggle.cpp
index 7edbbb08823c5018aac2a6e4b217309b66fbf8d9..451926956d12520de95ff4ba6aff7e9049556249 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,28 @@ Toggle::Toggle(const string &t):
        set_text(t);
 }
 
+void Toggle::autosize()
+{
+       if(!style)
+               return;
+
+       Widget::autosize();
+
+       if(const Part *text_part = style->get_part("text"))
+       {
+               const Sides &margin = text_part->get_margin();
+               geom.w = max(geom.w, text.get_width()+margin.left+margin.right);
+               geom.h = max(geom.h, text.get_height()+margin.top+margin.bottom);
+       }
+
+       rebuild();
+}
+
 void Toggle::set_text(const string &t)
 {
        text = t;
+       signal_autosize_changed.emit();
+       rebuild();
 }
 
 void Toggle::set_exclusive(bool e)
@@ -49,18 +62,18 @@ void Toggle::set_value(bool v)
        value = v;
        if(value)
        {
-               state |= ACTIVE;
+               set_state(ACTIVE);
                if(exclusive && parent)
                        exclude_siblings();
        }
        else
-               state &= ~ACTIVE;
+               clear_state(ACTIVE);
 }
 
-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, geom, part_cache);
 }
 
 void Toggle::button_press(int, int, unsigned btn)
@@ -90,30 +103,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 &>(wdg);
-}
-
 void Toggle::Loader::finish()
 {
-       Toggle &tgl = static_cast<Toggle &>(wdg);
-       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)
 {
-       static_cast<Toggle &>(wdg).text = t;
+       obj.text = t;
 }
 
 } // namespace GLtk