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

more work on cursor tracking state

Browse source
This commit is contained in:
Paul Davis 2014-06-18 21:03:25 -04:00
parent 2ee319e317
commit ad67a36d7d
3 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gtk2_ardour/editor.h
View file

@ -713,7 +713,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
std::stack<Gdk::Cursor*> _cursor_stack; std::stack<Gdk::Cursor*> _cursor_stack;
Gdk::Cursor* current_canvas_cursor; Gdk::Cursor* current_canvas_cursor;
Gdk::Cursor* which_grabber_cursor () const; 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_mode_cursor () const;
Gdk::Cursor* which_trim_cursor (bool left_side) const; Gdk::Cursor* which_trim_cursor (bool left_side) const;
bool reset_canvas_cursor (); bool reset_canvas_cursor ();

11
gtk2_ardour/editor_canvas.cc
View file

@ -1153,7 +1153,7 @@ Editor::which_mode_cursor () const
} }
Gdk::Cursor* Gdk::Cursor*
Editor::which_region_cursor () const Editor::which_track_cursor () const
{ {
Gdk::Cursor* cursor = 0; Gdk::Cursor* cursor = 0;
@ -1215,7 +1215,9 @@ Editor::choose_canvas_cursor_on_entry (GdkEventCrossing* /*event*/, ItemType typ
case RegionViewNameHighlight: case RegionViewNameHighlight:
case RegionViewName: case RegionViewName:
case WaveItem: case WaveItem:
cursor = which_region_cursor (); case StreamItem:
case AutomationTrackItem:
cursor = which_track_cursor ();
break; break;
case PlayheadCursorItem: case PlayheadCursorItem:
switch (_edit_point) { switch (_edit_point) {
@ -1240,11 +1242,10 @@ Editor::choose_canvas_cursor_on_entry (GdkEventCrossing* /*event*/, ItemType typ
cursor = _cursors->cross_hair; cursor = _cursors->cross_hair;
break; break;
case StartSelectionTrimItem: case StartSelectionTrimItem:
cursor = _cursors->left_side_trim;
break; break;
case EndSelectionTrimItem: case EndSelectionTrimItem:
break; cursor = _cursors->right_side_trim;
case AutomationTrackItem:
cursor = _cursors->cross_hair;
break; break;
case FadeInItem: case FadeInItem:
cursor = _cursors->fade_in; cursor = _cursors->fade_in;

7
gtk2_ardour/editor_mouse.cc
View file

@ -2577,7 +2577,6 @@ Editor::update_join_object_range_location (double y)
_join_object_range_state = JOIN_OBJECT_RANGE_RANGE; _join_object_range_state = JOIN_OBJECT_RANGE_RANGE;
} }
cerr << "Entered RV = " << entered_regionview << " track = " << entered_track << endl;
if (entered_regionview) { 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; _join_object_range_state = c <= 0.5 ? JOIN_OBJECT_RANGE_RANGE : JOIN_OBJECT_RANGE_OBJECT;
if (_join_object_range_state != old) { if (_join_object_range_state != old) {
set_canvas_cursor (which_region_cursor ()); set_canvas_cursor (which_track_cursor ());
} }
} else if (entered_track) { } 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 */ /* track/bus ... but not in a region ... use range mode */
_join_object_range_state = JOIN_OBJECT_RANGE_RANGE; _join_object_range_state = JOIN_OBJECT_RANGE_RANGE;
if (_join_object_range_state != old) { if (_join_object_range_state != old) {
set_canvas_cursor (which_region_cursor ()); set_canvas_cursor (which_track_cursor ());
} }
} else { } else {
/* Other kinds of tracks use object mode */ /* Other kinds of tracks use object mode */
_join_object_range_state = JOIN_OBJECT_RANGE_OBJECT; _join_object_range_state = JOIN_OBJECT_RANGE_OBJECT;
if (_join_object_range_state != old) { if (_join_object_range_state != old) {
set_canvas_cursor (which_region_cursor ()); set_canvas_cursor (which_track_cursor ());
} }
} }
} }