X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbutton.cpp;h=8e6e7131cb4157c266b096e4bd121931eb68abdb;hb=91997dd3189b93a67179822ec2fed5f2a7bddb74;hp=ec9901620d5d562ffd3b820316f69c0c2f829d44;hpb=aab3c89d03c1a99cb91ff1870775b2c44806bb79;p=libs%2Fgltk.git

diff --git a/source/button.cpp b/source/button.cpp
index ec99016..8e6e713 100644
--- a/source/button.cpp
+++ b/source/button.cpp
@@ -12,31 +12,30 @@ Distributed under the LGPL
 namespace Msp {
 namespace GLtk {
 
-Button::Button(const Resources &r, const std::string &t):
-	Widget(r),
+Button::Button(const std::string &t):
+	text(),
 	icon(0),
 	pressed(false)
 {
 	set_text(t);
-	update_style();
 }
 
 void Button::set_text(const std::string &t)
 {
-	text=t;
+	text = t;
 }
 
 void Button::set_icon(const GL::Texture2D *i)
 {
-	icon=i;
+	icon = i;
 }
 
 void Button::button_press(int, int, unsigned btn)
 {
 	if(btn==1)
 	{
-		pressed=true;
-		state|=ACTIVE;
+		pressed = true;
+		state |= ACTIVE;
 	}
 }
 
@@ -44,11 +43,11 @@ void Button::button_release(int x, int y, unsigned btn)
 {
 	if(pressed && btn==1)
 	{
+		state &= ~ACTIVE;
+		pressed = false;
+
 		if(geom.is_inside_relative(x, y))
 			signal_clicked.emit();
-		
-		state&=~ACTIVE;
-		pressed=false;
 	}
 }
 
@@ -57,21 +56,21 @@ void Button::pointer_motion(int x, int y)
 	if(pressed)
 	{
 		if(!geom.is_inside_relative(x, y))
-			state&=~ACTIVE;
+			state &= ~ACTIVE;
 		else
-			state|=ACTIVE;
+			state |= ACTIVE;
 	}
 }
 
 void Button::render_special(const Part &part) const
 {
 	if(part.get_name()=="text")
-		render_text(part, text);
+		text.render(part, geom);
 	if(part.get_name()=="icon" && icon)
 	{
 		Geometry rgeom;
-		rgeom.w=icon->get_width();
-		rgeom.h=icon->get_height();
+		rgeom.w = icon->get_width();
+		rgeom.h = icon->get_height();
 		part.get_alignment().apply(rgeom, geom, part.get_margin());
 
 		icon->bind();
@@ -91,16 +90,21 @@ void Button::render_special(const Part &part) const
 	}
 }
 
+void Button::on_style_change()
+{
+	text.set_style(style);
+}
+
 
 Button::Loader::Loader(Button &btn):
 	Widget::Loader(btn)
 {
-	add("text", &Button::text);
+	add("text", &Loader::text);
 }
 
-Button &Button::Loader::get_object() const
+void Button::Loader::text(const std::string &t)
 {
-	return static_cast<Button &>(wdg);
+	static_cast<Button &>(wdg).text = t;
 }
 
 } // namespace GLtk