X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftoggle.cpp;h=b0219fc82f8ec764b072404d067a2a1009daa392;hb=1597579a34a8d87d4dea0a0cdc0895e6247b6126;hp=e34b43ae38cc743ef721216e5b3d41b1b662ce26;hpb=df07e8f3e239b146cbc458d3cbd69758e590d255;p=libs%2Fgltk.git

diff --git a/source/toggle.cpp b/source/toggle.cpp
index e34b43a..b0219fc 100644
--- a/source/toggle.cpp
+++ b/source/toggle.cpp
@@ -14,24 +14,14 @@ Toggle::Toggle(const string &t):
 	value(false),
 	exclusive(false)
 {
+	input_type = INPUT_NAVIGATION;
 	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 +49,8 @@ void Toggle::exclude_siblings()
 
 void Toggle::set_value(bool v)
 {
+	bool old_value = value;
+
 	value = v;
 	if(value)
 	{
@@ -68,12 +60,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,15 +82,24 @@ 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;
 	}
 }
 
+bool Toggle::navigate(Navigation nav)
+{
+	if(nav==NAV_ACTIVATE)
+	{
+		if(!value || !exclusive)
+			set_value(!value);
+		return true;
+	}
+
+	return false;
+}
+
 void Toggle::on_style_change()
 {
 	text.set_style(style);