diff options
| author | Robin Gareus <robin@gareus.org> | 2020-04-17 20:51:25 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2020-04-17 20:51:47 +0200 |
| commit | bc9b490e9085e5b0f195cd825a34d23a45b0d605 (patch) | |
| tree | 01fb40a23ef9b26560c640b38100c8bd19a8be93 /gtk2_ardour | |
| parent | 0b67abca1d25ab873c5a14bbf060fff9ee3916cb (diff) | |
Fix canvas scroll-event zoom-focus
Unconditionally use the mouse-cursor as zoom-focus when holding
<ctrl> while scrolling on the canvas.
This is consistent with using ctrl + scroll in the ruler area.
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/editor_canvas_events.cc | 12 |
1 files 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 (); |