smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-06 06:44:57 +01:00
Code Issues Projects Releases Wiki Activity

Fix smart mode cursor on audio regions.

Browse source
This commit is contained in:
David Robillard 2014-12-30 12:49:59 -05:00
parent 5d1df86343
commit 486d47db0e
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
gtk2_ardour/editor_canvas.cc
View file

@ -1188,9 +1188,13 @@ Editor::which_canvas_cursor(ItemType type) const
switch (type) { switch (type) {
case RegionItem: case RegionItem:
case RegionViewNameHighlight: /* We don't choose a cursor for these items on top of a region view,
case RegionViewName: because this would push a new context on the enter stack which
case WaveItem: 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 StreamItem:
case AutomationTrackItem: case AutomationTrackItem:
cursor = which_track_cursor (); cursor = which_track_cursor ();

2
gtk2_ardour/editor_mouse.cc
View file

@ -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)); 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(); double const c = item_space.y / entered_regionview->height();
_join_object_range_state = c <= 0.5 ? JOIN_OBJECT_RANGE_RANGE : JOIN_OBJECT_RANGE_OBJECT; _join_object_range_state = c <= 0.5 ? JOIN_OBJECT_RANGE_RANGE : JOIN_OBJECT_RANGE_OBJECT;
Editor::EnterContext* ctx = get_enter_context(RegionItem); Editor::EnterContext* ctx = get_enter_context(RegionItem);