From bc9b490e9085e5b0f195cd825a34d23a45b0d605 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Fri, 17 Apr 2020 20:51:25 +0200 Subject: Fix canvas scroll-event zoom-focus Unconditionally use the mouse-cursor as zoom-focus when holding while scrolling on the canvas. This is consistent with using ctrl + scroll in the ruler area. --- gtk2_ardour/editor_canvas_events.cc | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/gtk2_ardour/editor_canvas_events.cc b/gtk2_ardour/editor_canvas_events.cc index a0fd6bc3b0..36b491c1d6 100644 --- a/gtk2_ardour/editor_canvas_events.cc +++ b/gtk2_ardour/editor_canvas_events.cc @@ -83,11 +83,7 @@ Editor::track_canvas_scroll (GdkEventScroll* ev) switch (direction) { case GDK_SCROLL_UP: if (Keyboard::modifier_state_equals (ev->state, Keyboard::ScrollZoomHorizontalModifier)) { - if (UIConfiguration::instance().get_use_mouse_position_as_zoom_focus_on_scroll()) { - temporal_zoom_step_mouse_focus (false); - } else { - temporal_zoom_step (false); - } + temporal_zoom_step_mouse_focus (false); return true; } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::ScrollHorizontalModifier)) { scroll_left_step (); @@ -112,11 +108,7 @@ Editor::track_canvas_scroll (GdkEventScroll* ev) case GDK_SCROLL_DOWN: if (Keyboard::modifier_state_equals (ev->state, Keyboard::ScrollZoomHorizontalModifier)) { - if (UIConfiguration::instance().get_use_mouse_position_as_zoom_focus_on_scroll()) { - temporal_zoom_step_mouse_focus (true); - } else { - temporal_zoom_step (true); - } + temporal_zoom_step_mouse_focus (true); return true; } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::ScrollHorizontalModifier)) { scroll_right_step (); -- cgit v1.2.3