X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftoggle.cpp;h=451926956d12520de95ff4ba6aff7e9049556249;hb=319cde3c06181ba1c3619567525002926d8b4889;hp=6d2a10b16644d6254163b53b26c6f92ead7754ce;hpb=2b70e8801c43875ed3f4135bdd0141265cff0312;p=libs%2Fgltk.git

diff --git a/source/toggle.cpp b/source/toggle.cpp
index 6d2a10b..4519269 100644
--- a/source/toggle.cpp
+++ b/source/toggle.cpp
@@ -30,12 +30,15 @@ void Toggle::autosize()
 		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)
@@ -59,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)
@@ -100,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 &>(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