diff options
| author | Ben Loftis <ben@harrisonconsoles.com> | 2018-07-26 14:23:59 -0500 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2018-07-27 00:28:47 +0200 |
| commit | 0883f02de92478800ad232f10d388219e2817ed7 (patch) | |
| tree | 28e65aba638709df055c1e44ccebf936060313ff /gtk2_ardour/editor_drag.cc | |
| parent | 83ce11e4111682c0dfea6b3927a157b9d23556ea (diff) | |
new_grid: The Return of the snap_to_X functions.
We no longer assume that Snap always uses the visible ruler lines.
If you want to snap to the grid, and ignore the users zoom scale, use SnapPref::SnapToGrid_Unscaled
This fixes 2 (known) oversights: "snap region(s) to grid" and "regions whose start are left of the canvas edge".
Diffstat (limited to 'gtk2_ardour/editor_drag.cc')
| -rw-r--r-- | gtk2_ardour/editor_drag.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc index 0c23fd6581..654cca2a16 100644 --- a/gtk2_ardour/editor_drag.cc +++ b/gtk2_ardour/editor_drag.cc @@ -381,7 +381,7 @@ Drag::setup_snap_delta (MusicSample pos) { TempoMap& map (_editor->session()->tempo_map()); MusicSample snap (pos); - _editor->snap_to (snap, ARDOUR::RoundNearest, ARDOUR::SnapToAny, false, true); + _editor->snap_to (snap, ARDOUR::RoundNearest, ARDOUR::SnapToAny_Visual, true); _snap_delta = snap.sample - pos.sample; _snap_delta_music = 0.0; @@ -5092,7 +5092,7 @@ RubberbandSelectDrag::motion (GdkEvent* event, bool) MusicSample grab (grab_sample (), 0); if (UIConfiguration::instance().get_rubberbanding_snaps_to_grid ()) { - _editor->snap_to_with_modifier (grab, event, RoundNearest, SnapToGrid); + _editor->snap_to_with_modifier (grab, event, RoundNearest, SnapToGrid_Scaled); } else { grab.sample = raw_grab_sample (); } @@ -6075,7 +6075,7 @@ NoteDrag::total_dx (GdkEvent * event) const /* possibly snap and return corresponding delta in quarter notes */ MusicSample snap (st, 0); - _editor->snap_to_with_modifier (snap, event, RoundNearest, SnapToGrid); + _editor->snap_to_with_modifier (snap, event, RoundNearest, SnapToGrid_Unscaled); double ret = map.exact_qn_at_sample (snap.sample, snap.division) - n_qn - snap_delta_music (event->button.state); /* prevent the earliest note being dragged earlier than the region's start position */ |