summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <carl@carlh.net>2011-09-28 19:23:13 +0000
committerCarl Hetherington <carl@carlh.net>2011-09-28 19:23:13 +0000
commit29902b57313987297d184952bfb0f25ccea9c075 (patch)
treefe40dc9e1487fa7eddbd0a6c74fd09cbcb7d17d6
parent5f2ef08666d7dccf5f3e6c626821d8e54c146e62 (diff)
Stop MidiRegionView claiming PrimaryModifier-scrollwheel so
that zoom still works when MIDI notes are selected (#4323). git-svn-id: svn://localhost/ardour2/branches/3.0@10159 d708f5d6-7413-0410-9779-e7cbd77b26cf
-rw-r--r--gtk2_ardour/midi_region_view.cc7
1 files changed, 7 insertions, 0 deletions
diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc
index 6fe9768feb..69f6b87442 100644
--- a/gtk2_ardour/midi_region_view.cc
+++ b/gtk2_ardour/midi_region_view.cc
@@ -719,6 +719,13 @@ MidiRegionView::scroll (GdkEventScroll* ev)
return false;
}
+ if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
+ /* XXX: bit of a hack; allow PrimaryModifier scroll through so that
+ it still works for zoom.
+ */
+ return false;
+ }
+
trackview.editor().verbose_cursor()->hide ();
bool fine = !Keyboard::modifier_state_equals (ev->state, Keyboard::SecondaryModifier);