X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbutton.cpp;h=3661c0148a0f56f61d35e85ad08de4074e3a4f4b;hb=1a6d9006d0a85d8b8266266a4fc5e135f07448ae;hp=58e69bfdad42543216da7dbb7ff6c7001835669c;hpb=ed9873ba7ee862ad76937f579fe371c1a27d5715;p=libs%2Fgltk.git

diff --git a/source/button.cpp b/source/button.cpp
index 58e69bf..3661c01 100644
--- a/source/button.cpp
+++ b/source/button.cpp
@@ -12,7 +12,8 @@ namespace Msp {
 namespace GLtk {
 
 Button::Button(const Resources &r, const std::string &t):
-	Widget(r)
+	Widget(r),
+	pressed(false)
 {
 	set_text(t);
 	update_style();
@@ -23,23 +24,28 @@ void Button::set_text(const std::string &t)
 	text=t;
 }
 
-void Button::button_press(int x, int y, unsigned btn)
+void Button::button_press(int, int, unsigned btn)
 {
-	if(geom.is_inside(x, y) && btn==1)
+	if(btn==1)
+	{
+		pressed=true;
 		state=ACTIVE;
+	}
 }
 
 void Button::button_release(int x, int y, unsigned btn)
 {
-	if(btn==1)
+	if(pressed && btn==1)
 	{
-		if(geom.is_inside(x, y))
+		if(geom.is_inside_relative(x, y))
 		{
 			state=HOVER;
 			signal_clicked.emit();
 		}
 		else
 			state=NORMAL;
+		
+		pressed=false;
 	}
 }