X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftoggle.cpp;h=cde3f24b0fd81254bd643aeeca592a8ac55db787;hb=762a689d799075c0a10e1633bf95d53de80b4572;hp=cb80880787e75162f3f03cc27cbe89444f17cf71;hpb=d1b8c27fd3fff14ef85913b601c160b5c435bdff;p=libs%2Fgltk.git

diff --git a/source/toggle.cpp b/source/toggle.cpp
index cb80880..cde3f24 100644
--- a/source/toggle.cpp
+++ b/source/toggle.cpp
@@ -8,16 +8,13 @@ using namespace std;
 namespace Msp {
 namespace GLtk {
 
-Toggle::Toggle(const string &t):
-	text(),
-	pressed(false),
-	value(false),
-	exclusive(false)
+Toggle::Toggle(const string &t)
 {
+	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 +24,7 @@ void Toggle::set_text(const string &t)
 {
 	text = t;
 	signal_autosize_changed.emit();
-	rebuild();
+	mark_rebuild();
 }
 
 void Toggle::set_exclusive(bool e)
@@ -39,9 +36,8 @@ 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);
 }
@@ -67,7 +63,7 @@ void Toggle::set_value(bool v)
 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)
@@ -87,6 +83,18 @@ void Toggle::button_release(int x, int y, unsigned btn)
 	}
 }
 
+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);