diff options
| -rw-r--r-- | gtk2_ardour/editor_canvas.cc | 10 | ||||
| -rw-r--r-- | gtk2_ardour/editor_mouse.cc | 2 |
2 files changed, 8 insertions, 4 deletions
diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc index c26f00603e..137337f786 100644 --- a/gtk2_ardour/editor_canvas.cc +++ b/gtk2_ardour/editor_canvas.cc @@ -1188,9 +1188,13 @@ Editor::which_canvas_cursor(ItemType type) const switch (type) { case RegionItem: - case RegionViewNameHighlight: - case RegionViewName: - case WaveItem: + /* We don't choose a cursor for these items on top of a region view, + because this would push a new context on the enter stack which + means switching the region context for things like smart mode + won't actualy change the cursor. */ + // case RegionViewNameHighlight: + // case RegionViewName: + // case WaveItem: case StreamItem: case AutomationTrackItem: cursor = which_track_cursor (); diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc index 9edef8056e..51b6795b1a 100644 --- a/gtk2_ardour/editor_mouse.cc +++ b/gtk2_ardour/editor_mouse.cc @@ -2316,7 +2316,7 @@ Editor::update_join_object_range_location (double y) ArdourCanvas::Duple const item_space = entered_regionview->get_canvas_group()->canvas_to_item (ArdourCanvas::Duple (0, y)); double const c = item_space.y / entered_regionview->height(); - + _join_object_range_state = c <= 0.5 ? JOIN_OBJECT_RANGE_RANGE : JOIN_OBJECT_RANGE_OBJECT; Editor::EnterContext* ctx = get_enter_context(RegionItem); |