From ad67a36d7da8d437e15de4ffc2b898692aacd22c Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Wed, 18 Jun 2014 21:03:25 -0400 Subject: [PATCH] more work on cursor tracking state --- gtk2_ardour/editor.h | 2 +- gtk2_ardour/editor_canvas.cc | 11 ++++++----- gtk2_ardour/editor_mouse.cc | 7 +++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h index a6fa0c992b..68a6e8bb57 100644 --- a/gtk2_ardour/editor.h +++ b/gtk2_ardour/editor.h @@ -713,7 +713,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD std::stack _cursor_stack; Gdk::Cursor* current_canvas_cursor; Gdk::Cursor* which_grabber_cursor () const; - Gdk::Cursor* which_region_cursor () const; + Gdk::Cursor* which_track_cursor () const; Gdk::Cursor* which_mode_cursor () const; Gdk::Cursor* which_trim_cursor (bool left_side) const; bool reset_canvas_cursor (); diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc index 73bc7d1884..bf7072edce 100644 --- a/gtk2_ardour/editor_canvas.cc +++ b/gtk2_ardour/editor_canvas.cc @@ -1153,7 +1153,7 @@ Editor::which_mode_cursor () const } Gdk::Cursor* -Editor::which_region_cursor () const +Editor::which_track_cursor () const { Gdk::Cursor* cursor = 0; @@ -1215,7 +1215,9 @@ Editor::choose_canvas_cursor_on_entry (GdkEventCrossing* /*event*/, ItemType typ case RegionViewNameHighlight: case RegionViewName: case WaveItem: - cursor = which_region_cursor (); + case StreamItem: + case AutomationTrackItem: + cursor = which_track_cursor (); break; case PlayheadCursorItem: switch (_edit_point) { @@ -1240,11 +1242,10 @@ Editor::choose_canvas_cursor_on_entry (GdkEventCrossing* /*event*/, ItemType typ cursor = _cursors->cross_hair; break; case StartSelectionTrimItem: + cursor = _cursors->left_side_trim; break; case EndSelectionTrimItem: - break; - case AutomationTrackItem: - cursor = _cursors->cross_hair; + cursor = _cursors->right_side_trim; break; case FadeInItem: cursor = _cursors->fade_in; diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc index 34b61eeaad..2df530290d 100644 --- a/gtk2_ardour/editor_mouse.cc +++ b/gtk2_ardour/editor_mouse.cc @@ -2577,7 +2577,6 @@ Editor::update_join_object_range_location (double y) _join_object_range_state = JOIN_OBJECT_RANGE_RANGE; } - cerr << "Entered RV = " << entered_regionview << " track = " << entered_track << endl; if (entered_regionview) { @@ -2587,7 +2586,7 @@ Editor::update_join_object_range_location (double y) _join_object_range_state = c <= 0.5 ? JOIN_OBJECT_RANGE_RANGE : JOIN_OBJECT_RANGE_OBJECT; if (_join_object_range_state != old) { - set_canvas_cursor (which_region_cursor ()); + set_canvas_cursor (which_track_cursor ()); } } else if (entered_track) { @@ -2598,13 +2597,13 @@ Editor::update_join_object_range_location (double y) /* track/bus ... but not in a region ... use range mode */ _join_object_range_state = JOIN_OBJECT_RANGE_RANGE; if (_join_object_range_state != old) { - set_canvas_cursor (which_region_cursor ()); + set_canvas_cursor (which_track_cursor ()); } } else { /* Other kinds of tracks use object mode */ _join_object_range_state = JOIN_OBJECT_RANGE_OBJECT; if (_join_object_range_state != old) { - set_canvas_cursor (which_region_cursor ()); + set_canvas_cursor (which_track_cursor ()); } } }