diff options
| author | Robin Gareus <robin@gareus.org> | 2020-05-01 22:09:16 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2020-05-01 22:12:39 +0200 |
| commit | 51795d2e117cd05d6951b70dcda57faa757d56b4 (patch) | |
| tree | 00231cae75428814bdcb34af0950428081e6bf94 /gtk2_ardour | |
| parent | 0486fe3e7db528c98c90ef8e4624aff5019fa385 (diff) | |
Fix contents-drag (ignore snap) #8073
The "new" snap-to-visual-grid mechanism is not useful for
Contents-trim. That would require a relative grid.
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/editor_drag.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc index d5810ae1cc..225104332a 100644 --- a/gtk2_ardour/editor_drag.cc +++ b/gtk2_ardour/editor_drag.cc @@ -2990,7 +2990,7 @@ TrimDrag::start_grab (GdkEvent* event, Gdk::Cursor*) show_verbose_cursor_duration (region_start, region_end); break; case ContentsTrim: - show_verbose_cursor_time (pf); + show_verbose_cursor_time (_primary->region()->start ()); break; } show_view_preview (_operation == StartTrim ? region_start : region_end); @@ -3149,7 +3149,7 @@ TrimDrag::motion (GdkEvent* event, bool first_move) case ContentsTrim: { - sample_delta = (last_pointer_sample() - adjusted_current_sample(event)); + sample_delta = (last_pointer_sample() - adjusted_current_sample(event, false)); for (list<DraggingView>::const_iterator i = _views.begin(); i != _views.end(); ++i) { i->view->move_contents (sample_delta); @@ -3166,7 +3166,7 @@ TrimDrag::motion (GdkEvent* event, bool first_move) show_verbose_cursor_duration (rv->region()->position(), rv->region()->last_sample()); break; case ContentsTrim: - // show_verbose_cursor_time (sample_delta); + show_verbose_cursor_time (rv->region()->start ()); break; } show_view_preview ((_operation == StartTrim ? rv->region()->position() : rv->region()->last_sample())); @@ -3295,6 +3295,7 @@ TrimDrag::setup_pointer_sample_offset () _pointer_sample_offset = raw_grab_sample() - i->initial_end; break; case ContentsTrim: + _pointer_sample_offset = 0; break; } } |