X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftoggle.cpp;h=3b896bedb7290451a202f3dcab2efbe2f40cb965;hb=70c409d5ae005b96f89d47da49f868e65b4e5734;hp=8c727d6c333e023e03bc77c113fbd921dabb5bde;hpb=30780ba31be92c977a68a2a9103eeba87747d530;p=libs%2Fgltk.git

diff --git a/source/toggle.cpp b/source/toggle.cpp
index 8c727d6..3b896be 100644
--- a/source/toggle.cpp
+++ b/source/toggle.cpp
@@ -14,81 +14,88 @@ using namespace std;
 namespace Msp {
 namespace GLtk {
 
-Toggle::Toggle(const Resources &r):
+Toggle::Toggle(const Resources &r, const string &t):
 	Widget(r),
+	text(),
 	pressed(false),
 	value(false),
 	exclusive(false)
 {
 	update_style();
+	set_text(t);
 }
 
 void Toggle::set_text(const string &t)
 {
-	text=t;
+	text = t;
 }
 
 void Toggle::set_exclusive(bool e)
 {
-	exclusive=e;
+	exclusive = e;
 	if(exclusive && value)
 		exclude_siblings();
 }
 
 void Toggle::set_value(bool v)
 {
-	value=v;
+	value = v;
 	if(value)
 	{
-		state|=ACTIVE;
+		state |= ACTIVE;
 		if(exclusive && parent)
 			exclude_siblings();
 	}
 	else
-		state&=~ACTIVE;
+		state &= ~ACTIVE;
 }
 
 void Toggle::button_press(int, int, unsigned btn)
 {
 	if(btn==1)
-		pressed=true;
+		pressed = true;
 }
 
 void Toggle::button_release(int x, int y, unsigned btn)
 {
 	if(pressed && btn==1)
 	{
-		if(geom.is_inside_relative(x, y))
+		if(geom.is_inside_relative(x, y) && (!value || !exclusive))
 		{
 			set_value(!value);
 			signal_toggled.emit(value);
 		}
 
-		pressed=false;
+		pressed = false;
 	}
 }
 
 void Toggle::render_special(const Part &part) const
 {
 	if(part.get_name()=="text")
-		render_text(part, text);
+		text.render(part, geom);
 }
 
 void Toggle::exclude_siblings()
 {
-	const list<Widget *> &siblings=parent->get_children();
+	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))
+		if(Toggle *tgl = dynamic_cast<Toggle *>(*i))
 			if(tgl!=this && tgl->get_exclusive() && tgl->get_value())
 				tgl->set_value(false);
 }
 
+void Toggle::on_style_change()
+{
+	text.set_style(style);
+}
+
 
 Toggle::Loader::Loader(Toggle &t):
 	Widget::Loader(t)
 {
 	add("exclusive", &Toggle::exclusive);
-	add("text",      &Toggle::text);
+	add("text",      &Loader::text);
 	add("value",     &Toggle::value);
 }
 
@@ -99,11 +106,16 @@ Toggle &Toggle::Loader::get_object() const
 
 void Toggle::Loader::finish()
 {
-	Toggle &tgl=static_cast<Toggle &>(wdg);
+	Toggle &tgl = static_cast<Toggle &>(wdg);
 	if(tgl.value)
-		tgl.state|=ACTIVE;
+		tgl.state |= ACTIVE;
 	else
-		tgl.state&=~ACTIVE;
+		tgl.state &= ~ACTIVE;
+}
+
+void Toggle::Loader::text(const string &t)
+{
+	static_cast<Toggle &>(wdg).text = t;
 }
 
 } // namespace GLtk