13
0

MIDI learn on ctrl + middle-click only (not ctrl + other mods + btn2).

This fixes various other operations that use ctrl + btn2.
e.g. ctrl+alt+btn2 temporary all un/solo/mute.
This commit is contained in:
Robin Gareus 2017-05-04 00:35:56 +02:00
parent a55fb928a7
commit 2f37885e4b

View File

@ -24,6 +24,7 @@
#include <pbd/controllable.h> #include <pbd/controllable.h>
#include <gtkmm2ext/binding_proxy.h> #include <gtkmm2ext/binding_proxy.h>
#include <gtkmm2ext/keyboard.h>
#include "pbd/i18n.h" #include "pbd/i18n.h"
@ -69,7 +70,7 @@ BindingProxy::set_bind_button_state (guint button, guint statemask)
bool bool
BindingProxy::is_bind_action (GdkEventButton *ev) BindingProxy::is_bind_action (GdkEventButton *ev)
{ {
return ( (ev->state & bind_statemask) && ev->button == bind_button ); return (Keyboard::modifier_state_equals (ev->state, bind_statemask) && ev->button == bind_button );
} }