summaryrefslogtreecommitdiff
path: root/libs/gtkmm2ext
diff options
context:
space:
mode:
authorRobin Gareus <robin@gareus.org>2017-05-04 00:35:56 +0200
committerRobin Gareus <robin@gareus.org>2017-05-04 00:35:56 +0200
commit2f37885e4bf19a6da4971d5a32e5169cf6fffc3e (patch)
treeac4e30eb915e0f2fe14014dabadf7f0c9b1da41a /libs/gtkmm2ext
parenta55fb928a7f8c2af5ce71ff0b8cb5a1006f4011d (diff)
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.
Diffstat (limited to 'libs/gtkmm2ext')
-rw-r--r--libs/gtkmm2ext/binding_proxy.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/libs/gtkmm2ext/binding_proxy.cc b/libs/gtkmm2ext/binding_proxy.cc
index 5ba5f7eba4..00732a3361 100644
--- a/libs/gtkmm2ext/binding_proxy.cc
+++ b/libs/gtkmm2ext/binding_proxy.cc
@@ -24,6 +24,7 @@
#include <pbd/controllable.h>
#include <gtkmm2ext/binding_proxy.h>
+#include <gtkmm2ext/keyboard.h>
#include "pbd/i18n.h"
@@ -69,7 +70,7 @@ BindingProxy::set_bind_button_state (guint button, guint statemask)
bool
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 );
}