Refactor widget autosizing

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

diff --git a/source/toggle.cpp b/source/toggle.cpp
index 789ae37ecfec59fdd5987b9739fa0818dc98f8d9..fe6518dda722b57fc6ffda3c2481d4e42ae63047 100644 (file)
--- a/source/toggle.cpp
+++ b/source/toggle.cpp
@@ -17,21 +17,10 @@ Toggle::Toggle(const string &t):
        set_text(t);
 }
 
-void Toggle::autosize()
+void Toggle::autosize_special(const Part &part, Geometry &ageom)
 {
-       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();
+       if(part.get_name()=="text")
+               text.autosize(part, ageom);
 }
 
 void Toggle::set_text(const string &t)
@@ -70,10 +59,10 @@ void Toggle::set_value(bool v)
                clear_state(ACTIVE);
 }
 
-void Toggle::rebuild_special(const Part &part, CachedPart &cache)
+void Toggle::rebuild_special(const Part &part)
 {
        if(part.get_name()=="text")
-               text.build(part, geom, cache);
+               text.build(part, geom, part_cache);
 }
 
 void Toggle::button_press(int, int, unsigned btn)
@@ -103,27 +92,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();
-       tgl.set_state(ACTIVE, (tgl.value ? ACTIVE : NORMAL));
+       obj.set_state(ACTIVE, (obj.value ? ACTIVE : NORMAL));
 }
 
 void Toggle::Loader::text(const string &t)
 {
-       get_object().text = t;
+       obj.text = t;
 }
 
 } // namespace GLtk