ArdourKeyboard - fix snap / delta logic for triple modifier combinations.
This commit is contained in:
parent
d295fe12e4
commit
231acfe191
|
@ -249,20 +249,20 @@ bool
|
||||||
ArdourKeyboard::indicates_snap (guint state)
|
ArdourKeyboard::indicates_snap (guint state)
|
||||||
{
|
{
|
||||||
const bool contains_s = Keyboard::modifier_state_contains (state, Keyboard::snap_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());
|
||||||
const bool contains_d = Keyboard::modifier_state_contains (state, Keyboard::snap_delta_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
|
bool
|
||||||
ArdourKeyboard::indicates_snap_delta (guint state)
|
ArdourKeyboard::indicates_snap_delta (guint state)
|
||||||
{
|
{
|
||||||
const bool contains_d = Keyboard::modifier_state_contains (state, Keyboard::snap_delta_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());
|
||||||
const bool contains_s = Keyboard::modifier_state_contains (state, Keyboard::snap_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
|
void
|
||||||
|
|
Loading…
Reference in New Issue
Block a user