allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

work on fixing/improving MIDI region/track scrolling behavior

Browse Source
This commit is contained in:
Paul Davis
2025-03-14 13:24:42 -06:00
parent 367800830d
commit c509de6814
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gtk2_ardour/midi_region_view.cc
View File

@@ -391,7 +391,7 @@ 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 and zoom.

6
gtk2_ardour/midi_view.cc
View File

@@ -422,7 +422,7 @@ MidiView::midi_canvas_group_event (GdkEvent* ev)
case GDK_SCROLL:
if (scroll (&ev->scroll)) {
return false;
return true;
}
break;
@@ -632,7 +632,7 @@ MidiView::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 and zoom.
@@ -674,10 +674,12 @@ MidiView::scroll (GdkEventScroll* ev)
case GDK_SCROLL_LEFT:
_editing_context.set_horizontal_position (_editing_context.horizontal_position() - 20.0);
return true;
break;
case GDK_SCROLL_RIGHT:
_editing_context.set_horizontal_position (_editing_context.horizontal_position() + 20.0);
return true;
break;
default:

2
gtk2_ardour/pianoroll_midi_view.cc
View File

@@ -183,7 +183,7 @@ PianorollMidiView::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)) {
switch (ev->direction) {