summaryrefslogtreecommitdiff
path: root/gtk2_ardour/editor_canvas.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2014-10-21 11:50:06 -0400
committerPaul Davis <paul@linuxaudiosystems.com>2014-10-21 11:50:06 -0400
commit46f5c0c769fe0e01b0c4672f47df468459b98471 (patch)
tree6b45ae423a3cf34d17579e2dd26c337c092ce9f3 /gtk2_ardour/editor_canvas.cc
parentc2ae228dd37bb9403bda9f78260bf1175f19c6af (diff)
fix note 15897 on #5589 - only use fader cursor for region gain line when in mouse gain mode
Diffstat (limited to 'gtk2_ardour/editor_canvas.cc')
-rw-r--r--gtk2_ardour/editor_canvas.cc20
1 files changed, 19 insertions, 1 deletions
diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc
index 074d72f4cd..1fc1cec434 100644
--- a/gtk2_ardour/editor_canvas.cc
+++ b/gtk2_ardour/editor_canvas.cc
@@ -1264,7 +1264,7 @@ Editor::choose_canvas_cursor_on_entry (GdkEventCrossing* /*event*/, ItemType typ
cursor = _cursors->fader;
break;
case GainLineItem:
- cursor = _cursors->fader;
+ cursor = which_track_cursor ();
break;
case AutomationLineItem:
cursor = _cursors->cross_hair;
@@ -1319,6 +1319,24 @@ Editor::choose_canvas_cursor_on_entry (GdkEventCrossing* /*event*/, ItemType typ
default:
break;
}
+
+ } else if (mouse_mode == MouseGain) {
+
+ /* ControlPointItem is not really specific to region gain mode
+ but it is the same cursor so don't worry about this for now.
+ The result is that we'll see the fader cursor if we enter
+ non-region-gain-line control points while in MouseGain
+ mode, even though we can't edit them in this mode.
+ */
+
+ switch (type) {
+ case GainLineItem:
+ case ControlPointItem:
+ cursor = _cursors->fader;
+ break;
+ default:
+ break;
+ }
}
switch (type) {