From 23b1c596309dd4409039c34736fc87ae4def280b Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Fri, 13 Jun 2014 18:43:16 -0400 Subject: [PATCH] fix erroneous start of autoscroll when mouse pointer is left or above the left/upper scrolling boundary but we're already scrolled to zero on the relevant axes --- gtk2_ardour/editor_canvas.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc index 12f119c711..2b6d8731fd 100644 --- a/gtk2_ardour/editor_canvas.cc +++ b/gtk2_ardour/editor_canvas.cc @@ -528,8 +528,8 @@ Editor::maybe_autoscroll (bool allow_horiz, bool allow_vert, bool from_headers) get_window()->get_pointer (x, y, mask); - if ((allow_horiz && (x < scrolling_boundary.x0 || x >= scrolling_boundary.x1)) || - (allow_vert && (y < scrolling_boundary.y0 || y >= scrolling_boundary.y1))) { + if ((allow_horiz && ((x < scrolling_boundary.x0 && leftmost_frame > 0) || x >= scrolling_boundary.x1)) || + (allow_vert && ((y < scrolling_boundary.y0 && vertical_adjustment.get_value() > 0)|| y >= scrolling_boundary.y1))) { start_canvas_autoscroll (allow_horiz, allow_vert, scrolling_boundary); } }