X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftoggle.cpp;h=bc40276baf6f1b35c5e6d769b1730eed93f3d4e0;hb=b4a3d651f57c46507aaa99a71a14fea15f0e430d;hp=fe6518dda722b57fc6ffda3c2481d4e42ae63047;hpb=d2d5b4c4dedf90a42dd2baff8334318b1d000f64;p=libs%2Fgltk.git

diff --git a/source/toggle.cpp b/source/toggle.cpp
index fe6518d..bc40276 100644
--- a/source/toggle.cpp
+++ b/source/toggle.cpp
@@ -14,10 +14,11 @@ Toggle::Toggle(const string &t):
 	value(false),
 	exclusive(false)
 {
+	input_type = INPUT_NAVIGATION;
 	set_text(t);
 }
 
-void Toggle::autosize_special(const Part &part, Geometry &ageom)
+void Toggle::autosize_special(const Part &part, Geometry &ageom) const
 {
 	if(part.get_name()=="text")
 		text.autosize(part, ageom);
@@ -27,7 +28,7 @@ void Toggle::set_text(const string &t)
 {
 	text = t;
 	signal_autosize_changed.emit();
-	rebuild();
+	mark_rebuild();
 }
 
 void Toggle::set_exclusive(bool e)
@@ -39,15 +40,16 @@ void Toggle::set_exclusive(bool e)
 
 void Toggle::exclude_siblings()
 {
-	const list<Widget *> &siblings = parent->get_children();
-	for(list<Widget *>::const_iterator i=siblings.begin(); i!=siblings.end(); ++i)
-		if(Toggle *tgl = dynamic_cast<Toggle *>(*i))
+	for(Widget *w: parent->get_children())
+		if(Toggle *tgl = dynamic_cast<Toggle *>(w))
 			if(tgl!=this && tgl->get_exclusive() && tgl->get_value())
 				tgl->set_value(false);
 }
 
 void Toggle::set_value(bool v)
 {
+	bool old_value = value;
+
 	value = v;
 	if(value)
 	{
@@ -57,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)
 {
 	if(part.get_name()=="text")
-		text.build(part, geom, part_cache);
+		text.build(part, state, geom, part_cache);
 }
 
 void Toggle::button_press(int, int, unsigned btn)
@@ -76,15 +81,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);