merge fix

[ardour.git] / gtk2_ardour / editor_canvas.cc

diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc
index 66417923be493c273c81c60d0f66b978ee70d1ee..6413b6d6910de00031a27aecd6851676a0711b76 100644 (file)
--- a/gtk2_ardour/editor_canvas.cc
+++ b/gtk2_ardour/editor_canvas.cc
@@ -1188,6 +1188,19 @@ Editor::which_canvas_cursor(ItemType type) const
 {
        Gdk::Cursor* cursor = which_mode_cursor ();
 
+       if (mouse_mode == MouseRange) {
+               switch (type) {
+               case StartSelectionTrimItem:
+                       cursor = _cursors->left_side_trim;
+                       break;
+               case EndSelectionTrimItem:
+                       cursor = _cursors->right_side_trim;
+                       break;
+               default:
+                       break;
+               }
+       }
+       
        if ((mouse_mode == MouseObject || get_smart_mode ()) ||
            mouse_mode == MouseContent) {
 
@@ -1223,7 +1236,7 @@ Editor::which_canvas_cursor(ItemType type) const
                        cursor = _cursors->fader;
                        break;
                case GainLineItem:
-                       cursor = which_track_cursor ();
+                       cursor = _cursors->cross_hair;
                        break;
                case AutomationLineItem:
                        cursor = _cursors->cross_hair;