From f603ca174eb389d13c3a578e207cae1784c22fcc Mon Sep 17 00:00:00 2001 From: Ben Loftis Date: Thu, 29 Jan 2015 11:23:49 -0600 Subject: in mixbus, treat the canvas rulers just like the canvas wrt mouse-wheel-zoom --- gtk2_ardour/editor_canvas_events.cc | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) (limited to 'gtk2_ardour/editor_canvas_events.cc') diff --git a/gtk2_ardour/editor_canvas_events.cc b/gtk2_ardour/editor_canvas_events.cc index 18e07cc2f2..7b0adaa4ad 100644 --- a/gtk2_ardour/editor_canvas_events.cc +++ b/gtk2_ardour/editor_canvas_events.cc @@ -1035,12 +1035,29 @@ Editor::canvas_ruler_event (GdkEvent *event, ArdourCanvas::Item* item, ItemType switch (event->scroll.direction) { case GDK_SCROLL_UP: - temporal_zoom_step (false); + + if (Profile->get_mixbus()) { + //for mouse-wheel zoom, force zoom-focus to mouse + Editing::ZoomFocus temp_focus = zoom_focus; + zoom_focus = Editing::ZoomFocusMouse; + temporal_zoom_step (false); + zoom_focus = temp_focus; + } else { + temporal_zoom_step (false); + } handled = true; break; case GDK_SCROLL_DOWN: - temporal_zoom_step (true); + if (Profile->get_mixbus()) { + //for mouse-wheel zoom, force zoom-focus to mouse + Editing::ZoomFocus temp_focus = zoom_focus; + zoom_focus = Editing::ZoomFocusMouse; + temporal_zoom_step (true); + zoom_focus = temp_focus; + } else { + temporal_zoom_step (true); + } handled = true; break; -- cgit v1.2.3