ardour/livetrax
13
0
Fork 0
Code

Fix contents-drag (ignore snap) #8073

Browse Source 
The "new" snap-to-visual-grid mechanism is not useful for
Contents-trim. That would require a relative grid.
This commit is contained in:
Robin Gareus 2020-05-01 22:09:16 +02:00
parent 0486fe3e7d
commit 51795d2e11
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gtk2_ardour/editor_drag.cc
View File

@ -2990,7 +2990,7 @@ TrimDrag::start_grab (GdkEvent* event, Gdk::Cursor*)
show_verbose_cursor_duration (region_start, region_end); show_verbose_cursor_duration (region_start, region_end);
break; break;
case ContentsTrim: case ContentsTrim:
show_verbose_cursor_time (pf); show_verbose_cursor_time (_primary->region()->start ());
break; break;
} }
show_view_preview (_operation == StartTrim ? region_start : region_end); show_view_preview (_operation == StartTrim ? region_start : region_end);
@ -3149,7 +3149,7 @@ TrimDrag::motion (GdkEvent* event, bool first_move)
case ContentsTrim: 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) { for (list<DraggingView>::const_iterator i = _views.begin(); i != _views.end(); ++i) {
i->view->move_contents (sample_delta); 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()); show_verbose_cursor_duration (rv->region()->position(), rv->region()->last_sample());
break; break;
case ContentsTrim: case ContentsTrim:
// show_verbose_cursor_time (sample_delta); show_verbose_cursor_time (rv->region()->start ());
break; break;
} }
show_view_preview ((_operation == StartTrim ? rv->region()->position() : rv->region()->last_sample())); 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; _pointer_sample_offset = raw_grab_sample() - i->initial_end;
break; break;
case ContentsTrim: case ContentsTrim:
_pointer_sample_offset = 0;
break; break;
} }
} }