namespace GLtk {
Button::Button(const Resources &r, const std::string &t):
- Widget(r)
+ Widget(r),
+ pressed(false)
{
set_text(t);
update_style();
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;
}
}