ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases 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 76a3a94536
commit e7895e1f80
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk2_ardour/editor.h
View File

@ -704,7 +704,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
std::stack<Gdk::Cursor*> _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 ();

11
gtk2_ardour/editor_canvas.cc
View File

@ -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;

7
gtk2_ardour/editor_mouse.cc
View File

@ -2571,7 +2571,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) {
@ -2581,7 +2580,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) {
@ -2592,13 +2591,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 ());
}
}
}