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

in MidiViews, primary-scroll is always left unhandled so that horizontal zoom works everywhere

Browse Source
This commit is contained in:
Paul Davis
2025-04-29 10:49:34 -06:00
parent 3cc3b867dc
commit d68472115f
3 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gtk2_ardour/midi_region_view.cc
View File

@@ -410,9 +410,8 @@ 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
if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
/* XXX: bit of a hack; allow PrimaryModifier scroll
* through so that it still works for navigation and zoom.
*/
return false;

5
gtk2_ardour/midi_view.cc
View File

@@ -645,9 +645,8 @@ MidiView::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
if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
/* XXX: bit of a hack; allow PrimaryModifier scroll
* through so that it still works for navigation and zoom.
*/
return false;

3
gtk2_ardour/pianoroll_midi_view.cc
View File

@@ -192,8 +192,7 @@ PianorollMidiView::scroll (GdkEventScroll* ev)
return false;
}
if (Keyboard::modifier_state_contains (ev->state, Keyboard::PrimaryModifier) &&
Keyboard::modifier_state_contains (ev->state, Keyboard::TertiaryModifier)) {
if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
switch (ev->direction) {
case GDK_SCROLL_UP: