summaryrefslogtreecommitdiff
path: root/gtk2_ardour
diff options
context:
space:
mode:
Diffstat (limited to 'gtk2_ardour')
-rw-r--r--gtk2_ardour/editor_summary.cc14
1 files changed, 12 insertions, 2 deletions
diff --git a/gtk2_ardour/editor_summary.cc b/gtk2_ardour/editor_summary.cc
index a4a6a9d73e..54b40ed610 100644
--- a/gtk2_ardour/editor_summary.cc
+++ b/gtk2_ardour/editor_summary.cc
@@ -586,9 +586,9 @@ EditorSummary::on_scroll_event (GdkEventScroll* ev)
amount = 1;
}
- if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
+ if (Keyboard::modifier_state_equals (ev->state, Keyboard::SecondaryModifier)) {
- /* primary-wheel == left-right scrolling */
+ /* secondary-wheel == left-right scrolling */
if (ev->direction == GDK_SCROLL_UP) {
x += amount;
@@ -596,6 +596,16 @@ EditorSummary::on_scroll_event (GdkEventScroll* ev)
x -= amount;
}
+ } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
+
+ /* primary-wheel == zoom */
+
+ if (ev->direction == GDK_SCROLL_UP) {
+ _editor->temporal_zoom_step (false);
+ } else {
+ _editor->temporal_zoom_step (true);
+ }
+
} else {
if (ev->direction == GDK_SCROLL_DOWN) {