X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftoggle.cpp;h=b597eb99d32ad73eb02123e2fa83429d7836977f;hb=707b59d45ae50b69c94918f8f74313283b304597;hp=789ae37ecfec59fdd5987b9739fa0818dc98f8d9;hpb=1aa6cd9b865e366737dcc9d2d36c4f8faed5bc4f;p=libs%2Fgltk.git

diff --git a/source/toggle.cpp b/source/toggle.cpp
index 789ae37..b597eb9 100644
--- 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) const
 {
-	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)
@@ -59,6 +48,8 @@ void Toggle::exclude_siblings()
 
 void Toggle::set_value(bool v)
 {
+	bool old_value = value;
+
 	value = v;
 	if(value)
 	{
@@ -68,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, CachedPart &cache)
+void Toggle::rebuild_special(const Part &part)
 {
 	if(part.get_name()=="text")
-		text.build(part, geom, cache);
+		text.build(part, state, geom, part_cache);
 }
 
 void Toggle::button_press(int, int, unsigned btn)
@@ -87,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;
 	}
@@ -103,27 +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();
-	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