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

diff --git a/source/toggle.cpp b/source/toggle.cpp
index 8c727d6..d31ff9f 100644
--- a/source/toggle.cpp
+++ b/source/toggle.cpp
@@ -14,13 +14,15 @@ 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)
@@ -58,7 +60,7 @@ 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);
@@ -71,7 +73,7 @@ void Toggle::button_release(int x, int y, unsigned btn)
 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()
@@ -83,12 +85,17 @@ void Toggle::exclude_siblings()
 				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);
 }
 
@@ -106,5 +113,10 @@ void Toggle::Loader::finish()
 		tgl.state&=~ACTIVE;
 }
 
+void Toggle::Loader::text(const string &t)
+{
+	static_cast<Toggle &>(wdg).text=t;
+}
+
 } // namespace GLtk
 } // namespace Msp