13
0

MIDI editing: primary+tertiary makes scroll do what it does when not editing

This commit is contained in:
Paul Davis 2022-08-31 12:15:51 -06:00
parent cbbc6f9b84
commit b11ba8eec7

View File

@ -685,6 +685,14 @@ MidiRegionView::scroll (GdkEventScroll* ev)
return false;
}
if (Keyboard::modifier_state_contains (ev->state, Keyboard::PrimaryModifier) &&
Keyboard::modifier_state_contains (ev->state, Keyboard::TertiaryModifier)) {
/* XXX: bit of a hack; allow PrimaryModifier+TertiaryModifier scroll
* through so that it still works for navigation.
*/
return false;
}
if (_selection.empty()) {
const int step = Keyboard::modifier_state_equals (ev->state, Keyboard::TertiaryModifier) ? 12 : 1;
const bool just_one_edge = Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier);
@ -709,14 +717,6 @@ MidiRegionView::scroll (GdkEventScroll* ev)
return false;
}
if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier) ||
Keyboard::modifier_state_equals (ev->state, Keyboard::TertiaryModifier)) {
/* XXX: bit of a hack; allow PrimaryModifier and TertiaryModifier scroll
* through so that it still works for navigation.
*/
return false;
}
hide_verbose_cursor ();
bool fine = !Keyboard::modifier_state_contains (ev->state, Keyboard::SecondaryModifier);