ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

Make ArdourButton detect when a grab should stop being pressed

Browse Source 
If for whatever reason a grab is taken (e.g. a menu popping up) while
somebody is pressing a mouse button on an ArdourButton, then the
ArdourButton will not get the mouse button release event and will look
stuck in pressed position.

The leave notify event is fired if the mouse is still on the
ArdourButton while the grab is taken, but not if the user was dragging
the mouse outside of the button.

The only reliable way is to listen for the grab_broken_event signal.
Do so.
This commit is contained in:
Julien "_FrnchFrgg_" RIVAUD 2016-08-18 16:09:50 +02:00
parent 0ab81183c0
commit 523306036e
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gtk2_ardour/ardour_button.cc
View File

@ -97,6 +97,8 @@ ArdourButton::ArdourButton (Element e)
, _pattern_height (0)
{
UIConfiguration::instance().ColorsChanged.connect (sigc::mem_fun (*this, &ArdourButton::color_handler));
/* This is not provided by gtkmm */
signal_grab_broken_event().connect (sigc::mem_fun (*this, &ArdourButton::on_grab_broken_event));
}
ArdourButton::ArdourButton (const std::string& str, Element e)
@ -140,6 +142,8 @@ ArdourButton::ArdourButton (const std::string& str, Element e)
set_text (str);
UIConfiguration::instance().ColorsChanged.connect (sigc::mem_fun (*this, &ArdourButton::color_handler));
UIConfiguration::instance().DPIReset.connect (sigc::mem_fun (*this, &ArdourButton::on_name_changed));
/* This is not provided by gtkmm */
signal_grab_broken_event().connect (sigc::mem_fun (*this, &ArdourButton::on_grab_broken_event));
}
ArdourButton::~ArdourButton()
@ -1060,6 +1064,16 @@ ArdourButton::on_leave_notify_event (GdkEventCrossing* ev)
return CairoWidget::on_leave_notify_event (ev);
}
bool
ArdourButton::on_grab_broken_event(GdkEventGrabBroken* grab_broken_event) {
/* Our implicit grab due to a button_press was broken by another grab:
* the button will not get any button_release event if the mouse leaves
* while the grab is taken, so unpress ourselves */
_grabbed = false;
CairoWidget::set_dirty ();
return true;
}
void
ArdourButton::set_tweaks (Tweaks t)
{

1
gtk2_ardour/ardour_button.h
View File

@ -124,6 +124,7 @@ class ArdourButton : public CairoWidget , public Gtkmm2ext::Activatable
void on_realize ();
bool on_enter_notify_event (GdkEventCrossing*);
bool on_leave_notify_event (GdkEventCrossing*);
bool on_grab_broken_event(GdkEventGrabBroken*);
bool on_focus_in_event (GdkEventFocus*);
bool on_focus_out_event (GdkEventFocus*);
bool on_key_release_event (GdkEventKey *);