From 116a0ad327f95f74f355035c4ec41cb6ff49d9d8 Mon Sep 17 00:00:00 2001 From: Ben Loftis Date: Mon, 7 Jul 2014 14:46:05 -0500 Subject: [PATCH] fix inconsistency in smart mode where it shows a trim cursor in the top half of the region edge, but a click is actually going to start a range. It is arguable that we _should_ allow trimming in the top half, but that is complicated. This change is small and makes it consistent for now --- gtk2_ardour/editor_canvas.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc index 4529284952..c64ee7ccc2 100644 --- a/gtk2_ardour/editor_canvas.cc +++ b/gtk2_ardour/editor_canvas.cc @@ -1290,10 +1290,12 @@ Editor::choose_canvas_cursor_on_entry (GdkEventCrossing* /*event*/, ItemType typ cursor = _cursors->cross_hair; break; case LeftFrameHandle: - cursor = which_trim_cursor (true); + if ( effective_mouse_mode() == MouseObject ) // (smart mode): if the user is in the top half, override the trim cursor, since they are in the range zone + cursor = which_trim_cursor (true); //alternatively, one could argue that we _should_ allow trims here, and disallow range selection break; case RightFrameHandle: - cursor = which_trim_cursor (false); + if ( effective_mouse_mode() == MouseObject ) //see above + cursor = which_trim_cursor (false); break; case StartCrossFadeItem: cursor = _cursors->fade_in;