summaryrefslogtreecommitdiff
path: root/gtk2_ardour/editor_canvas.cc
diff options
context:
space:
mode:
authorBen Loftis <ben@harrisonconsoles.com>2014-07-07 14:46:05 -0500
committerBen Loftis <ben@harrisonconsoles.com>2014-07-07 14:46:05 -0500
commit116a0ad327f95f74f355035c4ec41cb6ff49d9d8 (patch)
treeefd840ee71bbca27c8cb71cda3272f2feac745a5 /gtk2_ardour/editor_canvas.cc
parentabe203de652962665452672c289350e5e07ea9f2 (diff)
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
Diffstat (limited to 'gtk2_ardour/editor_canvas.cc')
-rw-r--r--gtk2_ardour/editor_canvas.cc6
1 files 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;