diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2015-01-29 12:15:36 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2015-01-29 12:16:18 -0500 |
| commit | 17b8d9836dfdae87c25a0f996f0424cd0d661956 (patch) | |
| tree | ea2b76183da7ed244297234cbdf7242aa8232f9a /gtk2_ardour/utils.cc | |
| parent | f603ca174eb389d13c3a578e207cae1784c22fcc (diff) | |
don't wipe out SHIFT from event state when processing keyboard events, as done in a recent commit
Diffstat (limited to 'gtk2_ardour/utils.cc')
| -rw-r--r-- | gtk2_ardour/utils.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gtk2_ardour/utils.cc b/gtk2_ardour/utils.cc index e16864328c..e790595106 100644 --- a/gtk2_ardour/utils.cc +++ b/gtk2_ardour/utils.cc @@ -529,7 +529,8 @@ ARDOUR_UI_UTILS::key_press_focus_accelerator_handler (Gtk::Window& window, GdkEv if (allow_activating) { DEBUG_TRACE (DEBUG::Accelerators, "\tsending to window\n"); - if (gtk_accel_groups_activate (G_OBJECT(win), ev->keyval, GdkModifierType (ev->state & mask))) { + if (gtk_accel_groups_activate (G_OBJECT(win), ev->keyval, + (GdkModifierType) (ev->state & gtk_accelerator_get_default_mod_mask()))) { DEBUG_TRACE (DEBUG::Accelerators, "\t\thandled\n"); return true; } @@ -549,7 +550,8 @@ ARDOUR_UI_UTILS::key_press_focus_accelerator_handler (Gtk::Window& window, GdkEv if (!gtk_window_propagate_key_event (win, ev)) { DEBUG_TRACE (DEBUG::Accelerators, "\tpropagation didn't handle, so activate\n"); if (allow_activating) { - return gtk_accel_groups_activate (G_OBJECT(win), ev->keyval, GdkModifierType (ev->state & mask)); + return gtk_accel_groups_activate (G_OBJECT(win), ev->keyval, + (GdkModifierType) (ev->state & gtk_accelerator_get_default_mod_mask())); } else { DEBUG_TRACE (DEBUG::Accelerators, "\tactivation skipped\n"); } |