X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=inline;f=source%2Fbutton.cpp;h=f6cf56c1f07ecbd8b0fa41a7b49e13d269b50156;hb=3db68f2604b657e79f1b2b317c19c41c2d5a985b;hp=58e69bfdad42543216da7dbb7ff6c7001835669c;hpb=ed9873ba7ee862ad76937f579fe371c1a27d5715;p=libs%2Fgltk.git

diff --git a/source/button.cpp b/source/button.cpp
index 58e69bf..f6cf56c 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,34 +24,36 @@ 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)
-		state=ACTIVE;
+	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))
-		{
-			state=HOVER;
+		if(geom.is_inside_relative(x, y))
 			signal_clicked.emit();
-		}
-		else
-			state=NORMAL;
+		
+		state&=~ACTIVE;
+		pressed=false;
 	}
 }
 
-void Button::pointer_enter()
+void Button::pointer_motion(int x, int y)
 {
-	state=HOVER;
-}
-
-void Button::pointer_leave()
-{
-	state=NORMAL;
+	if(pressed)
+	{
+		if(!geom.is_inside_relative(x, y))
+			state&=~ACTIVE;
+		else
+			state|=ACTIVE;
+	}
 }
 
 void Button::render_special(const Part &part) const