From b11ba8eec7e77e8f9418eb3c23a2c90aa60f03f4 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Wed, 31 Aug 2022 12:15:51 -0600
Subject: [PATCH] MIDI editing: primary+tertiary makes scroll do what it does
 when not editing

---
 gtk2_ardour/midi_region_view.cc | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc
index 90b44065ea..618a0f0faa 100644
--- a/gtk2_ardour/midi_region_view.cc
+++ b/gtk2_ardour/midi_region_view.cc
@@ -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);