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

diff --git a/source/button.cpp b/source/button.cpp
index 292625d..8e6e713 100644
--- a/source/button.cpp
+++ b/source/button.cpp
@@ -12,32 +12,30 @@ Distributed under the LGPL
 namespace Msp {
 namespace GLtk {
 
-Button::Button(const Resources &r, const std::string &t):
-	Widget(r),
-	text(style),
+Button::Button(const std::string &t):
+	text(),
 	icon(0),
 	pressed(false)
 {
-	update_style();
 	set_text(t);
 }
 
 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;
 	}
 }
 
@@ -45,8 +43,8 @@ void Button::button_release(int x, int y, unsigned btn)
 {
 	if(pressed && btn==1)
 	{
-		state&=~ACTIVE;
-		pressed=false;
+		state &= ~ACTIVE;
+		pressed = false;
 
 		if(geom.is_inside_relative(x, y))
 			signal_clicked.emit();
@@ -58,9 +56,9 @@ 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;
 	}
 }
 
@@ -71,8 +69,8 @@ void Button::render_special(const Part &part) const
 	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();
@@ -94,7 +92,7 @@ void Button::render_special(const Part &part) const
 
 void Button::on_style_change()
 {
-	text.update_style();
+	text.set_style(style);
 }
 
 
@@ -106,7 +104,7 @@ Button::Loader::Loader(Button &btn):
 
 void Button::Loader::text(const std::string &t)
 {
-	static_cast<Button &>(wdg).text=t;
+	static_cast<Button &>(wdg).text = t;
 }
 
 } // namespace GLtk