smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-13 01:56:34 +01:00
Code Issues Projects Releases Wiki Activity

don't wipe out SHIFT from event state when processing keyboard events, as done in a recent commit

Browse source
This commit is contained in:
Paul Davis 2015-01-29 12:15:36 -05:00
parent f603ca174e
commit 17b8d9836d
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
gtk2_ardour/utils.cc
View file

@ -529,7 +529,8 @@ ARDOUR_UI_UTILS::key_press_focus_accelerator_handler (Gtk::Window& window, GdkEv
if (allow_activating) { if (allow_activating) {
DEBUG_TRACE (DEBUG::Accelerators, "\tsending to window\n"); 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"); DEBUG_TRACE (DEBUG::Accelerators, "\t\thandled\n");
return true; 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)) { if (!gtk_window_propagate_key_event (win, ev)) {
DEBUG_TRACE (DEBUG::Accelerators, "\tpropagation didn't handle, so activate\n"); DEBUG_TRACE (DEBUG::Accelerators, "\tpropagation didn't handle, so activate\n");
if (allow_activating) { 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 { } else {
DEBUG_TRACE (DEBUG::Accelerators, "\tactivation skipped\n"); DEBUG_TRACE (DEBUG::Accelerators, "\tactivation skipped\n");
} }