ardour/livetrax
13
0
Fork 0
Code

manual cleanup after another tricky rebase against master

Browse Source
This commit is contained in:
Paul Davis 2024-06-03 18:43:15 -06:00
parent e630051de1
commit 3aba913649
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gtk2_ardour/editor.cc
View File

@ -6153,21 +6153,21 @@ Editor::upper_left() const
} }
void void
Editor::start_track_drag (TimeAxisView& tav, int y, Gtk::Widget& w) Editor::start_track_drag (TimeAxisView& tav, int y, Gtk::Widget& w, bool can_change_cursor)
{ {
track_drag = new TrackDrag (dynamic_cast<RouteTimeAxisView*> (&tav), *_session); track_drag = new TrackDrag (dynamic_cast<RouteTimeAxisView*> (&tav), *_session);
DEBUG_TRACE (DEBUG::TrackDrag, string_compose ("start track drag with %1\n", track_drag)); DEBUG_TRACE (DEBUG::TrackDrag, string_compose ("start track drag with %1\n", track_drag));
PBD::stacktrace (std::cerr, 20);
track_drag->drag_cursor = _cursors->move->gobj();
track_drag->predrag_cursor = gdk_window_get_cursor (edit_controls_vbox.get_window()->gobj());
gdk_window_set_cursor (edit_controls_vbox.get_toplevel()->get_window()->gobj(), track_drag->drag_cursor);
int xo, yo; int xo, yo;
w.translate_coordinates (edit_controls_vbox, 0, y, xo, yo); w.translate_coordinates (edit_controls_vbox, 0, y, xo, yo);
if (can_change_cursor) {
track_drag->drag_cursor = _cursors->move->gobj();
track_drag->predrag_cursor = gdk_window_get_cursor (edit_controls_vbox.get_window()->gobj());
gdk_window_set_cursor (edit_controls_vbox.get_toplevel()->get_window()->gobj(), track_drag->drag_cursor);
track_drag->have_predrag_cursor = true; track_drag->have_predrag_cursor = true;
}
track_drag->bump_track = nullptr; track_drag->bump_track = nullptr;
track_drag->previous = yo; track_drag->previous = yo;
track_drag->start = yo; track_drag->start = yo;
@ -6190,6 +6190,14 @@ Editor::mid_track_drag (GdkEventMotion* ev, Gtk::Widget& w)
if (!track_drag->track->selected()) { if (!track_drag->track->selected()) {
set_selected_track (*track_drag->track, Selection::Set, false); set_selected_track (*track_drag->track, Selection::Set, false);
} }
if (!track_drag->have_predrag_cursor) {
track_drag->drag_cursor = _cursors->move->gobj();
track_drag->predrag_cursor = gdk_window_get_cursor (edit_controls_vbox.get_window()->gobj());
gdk_window_set_cursor (edit_controls_vbox.get_toplevel()->get_window()->gobj(), track_drag->drag_cursor);
track_drag->have_predrag_cursor = true;
}
track_drag->first_move = false; track_drag->first_move = false;
} }