diff options
| author | nick_m <mainsbridge@gmail.com> | 2015-10-14 04:09:23 +1100 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2015-10-20 00:53:30 +1100 |
| commit | e6b35d2cddc1444af934bb6ff4268c000d5848a3 (patch) | |
| tree | 33c5b67f846bfffccd21b726591bd1da98a020d0 /gtk2_ardour/keyboard.cc | |
| parent | a34f24d8de7432996f79384bf3f48e5e6b749bb3 (diff) | |
Fix snap modifier logic (again).
Diffstat (limited to 'gtk2_ardour/keyboard.cc')
| -rw-r--r-- | gtk2_ardour/keyboard.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/gtk2_ardour/keyboard.cc b/gtk2_ardour/keyboard.cc index 1197033005..a75635cf94 100644 --- a/gtk2_ardour/keyboard.cc +++ b/gtk2_ardour/keyboard.cc @@ -248,21 +248,21 @@ ArdourKeyboard::set_state (const XMLNode& node, int version) 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 contains_s = Keyboard::modifier_state_contains (state, Keyboard::snap_modifier ()); + const bool contains_d = Keyboard::modifier_state_contains (state, Keyboard::snap_delta_modifier ()); + const bool s_contains_d = Keyboard::modifier_state_contains (Keyboard::snap_modifier (), Keyboard::snap_delta_modifier ()); - return (contains_s && ((contains_d && equals_s) || !contains_d)); + return (contains_s && ((contains_d && s_contains_d) || !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 contains_d = Keyboard::modifier_state_contains (state, Keyboard::snap_delta_modifier ()); + const bool contains_s = Keyboard::modifier_state_contains (state, Keyboard::snap_modifier ()); + const bool d_contains_s = Keyboard::modifier_state_contains (Keyboard::snap_delta_modifier (), Keyboard::snap_modifier ()); - return (contains_d && ((contains_s && equals_d) || !contains_s)); + return (contains_d && ((contains_s && d_contains_s) || !contains_s)); } void |