diff options
| author | nick_m <mainsbridge@gmail.com> | 2015-10-08 01:46:52 +1100 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2015-10-20 00:53:30 +1100 |
| commit | 231acfe1915396cb8d240b191735d28536b113c9 (patch) | |
| tree | 02ad52f08fc4004feea6d5eb9908f95d2073d2a0 /gtk2_ardour/keyboard.cc | |
| parent | d295fe12e4c691ee59b92cd05743aef845db0d7c (diff) | |
ArdourKeyboard - fix snap / delta logic for triple modifier combinations.
Diffstat (limited to 'gtk2_ardour/keyboard.cc')
| -rw-r--r-- | gtk2_ardour/keyboard.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gtk2_ardour/keyboard.cc b/gtk2_ardour/keyboard.cc index ae477943db..1197033005 100644 --- a/gtk2_ardour/keyboard.cc +++ b/gtk2_ardour/keyboard.cc @@ -249,20 +249,20 @@ bool ArdourKeyboard::indicates_snap (guint state) { const bool contains_s = Keyboard::modifier_state_contains (state, Keyboard::snap_modifier()); + const bool equals_s = Keyboard::modifier_state_equals (state, Keyboard::snap_modifier()); const bool contains_d = Keyboard::modifier_state_contains (state, Keyboard::snap_delta_modifier()); - const bool equals_d = Keyboard::modifier_state_equals (state, Keyboard::snap_delta_modifier()); - return (contains_s && ((contains_d && !equals_d) || !contains_d)); + return (contains_s && ((contains_d && equals_s) || !contains_d)); } bool ArdourKeyboard::indicates_snap_delta (guint state) { const bool contains_d = Keyboard::modifier_state_contains (state, Keyboard::snap_delta_modifier()); + const bool equals_d = Keyboard::modifier_state_equals (state, Keyboard::snap_delta_modifier()); const bool contains_s = Keyboard::modifier_state_contains (state, Keyboard::snap_modifier()); - const bool equals_s = Keyboard::modifier_state_equals (state, Keyboard::snap_modifier()); - return (contains_d && ((contains_s && !equals_s) || !contains_s)); + return (contains_d && ((contains_s && equals_d) || !contains_s)); } void |