From d68472115fc0476fc493ee3ed6c159226bf69d5f Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 29 Apr 2025 10:49:34 -0600 Subject: [PATCH] in MidiViews, primary-scroll is always left unhandled so that horizontal zoom works everywhere --- gtk2_ardour/midi_region_view.cc | 5 ++--- gtk2_ardour/midi_view.cc | 5 ++--- gtk2_ardour/pianoroll_midi_view.cc | 3 +-- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc index aaaac95f3c..41750a3a0d 100644 --- a/gtk2_ardour/midi_region_view.cc +++ b/gtk2_ardour/midi_region_view.cc @@ -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; diff --git a/gtk2_ardour/midi_view.cc b/gtk2_ardour/midi_view.cc index 99a2cb1e6b..5ff880c303 100644 --- a/gtk2_ardour/midi_view.cc +++ b/gtk2_ardour/midi_view.cc @@ -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; diff --git a/gtk2_ardour/pianoroll_midi_view.cc b/gtk2_ardour/pianoroll_midi_view.cc index 6555c248a1..434ff105ae 100644 --- a/gtk2_ardour/pianoroll_midi_view.cc +++ b/gtk2_ardour/pianoroll_midi_view.cc @@ -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: