ardour/livetrax
13
0
Fork 0
Code

change MidiRegionView scroll behavior to somethings slightly more useful

Browse Source 
1. leave tertiary-scroll for navigation and primary scroll for session timeline zoom
2. unmodified scroll in edit mode scrolls contents
3. secondary-scroll zooms in and out on contents (i.e. vertical zoom for MIDI)
4. primary-secondary scroll has the just-one-edge behavior previously provided
This commit is contained in:
Paul Davis 2022-09-30 16:32:20 -06:00
parent 07dea50456
commit 173de9f0ef
1 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
gtk2_ardour/midi_region_view.cc
View File

@ -686,28 +686,43 @@ MidiRegionView::scroll (GdkEventScroll* ev)
return false;
}
if (Keyboard::modifier_state_contains (ev->state, Keyboard::PrimaryModifier) &&
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.
* through so that it still works for navigation and zoom.
*/
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);
const int step = 1;
const bool zoom = Keyboard::modifier_state_equals (ev->state, Keyboard::SecondaryModifier);
const bool just_one_edge = Keyboard::modifier_state_equals (ev->state, Keyboard::SecondaryModifier|Keyboard::PrimaryModifier);
switch (ev->direction) {
case GDK_SCROLL_UP:
if (midi_stream_view()->highest_note() < 127 - step) {
midi_stream_view()->apply_note_range (midi_stream_view()->lowest_note() + (just_one_edge ? 0 : step), midi_stream_view()->highest_note() + step, true);
if (just_one_edge) {
/* make higher notes visible aka expand higher pitch range */
midi_stream_view()->apply_note_range (midi_stream_view()->lowest_note(), min (127, midi_stream_view()->highest_note() + step), true);
} else if (zoom) {
/* zoom out to show more higher and lower pitches */
midi_stream_view()->apply_note_range (max (0, midi_stream_view()->lowest_note() - step), min (127, midi_stream_view()->highest_note() + step), true);
} else {
/* scroll towards higher pitches */
midi_stream_view()->apply_note_range (max (0, midi_stream_view()->lowest_note() + step), min (127, midi_stream_view()->highest_note() + step), true);
}
return true;
case GDK_SCROLL_DOWN:
if (midi_stream_view()->lowest_note() >= step) {
midi_stream_view()->apply_note_range (midi_stream_view()->lowest_note() - step, midi_stream_view()->highest_note() - (just_one_edge ? 0 : step), true);
if (just_one_edge) {
/* make lower notes visible aka expand lower pitch range */
midi_stream_view()->apply_note_range (max (0, midi_stream_view()->lowest_note() - step), midi_stream_view()->highest_note(), true);
} else if (zoom) {
/* zoom in to show less higher and lower pitches */
midi_stream_view()->apply_note_range (min (127, midi_stream_view()->lowest_note() + step), max (0, midi_stream_view()->highest_note() - step), true);
} else {
/* scroll towards lower pitches */
midi_stream_view()->apply_note_range (min (127, midi_stream_view()->lowest_note() - step), max (0, midi_stream_view()->highest_note() - step), true);
}
return true;