From a60dfc19d2afb3b9826354666bee5c58680525d4 Mon Sep 17 00:00:00 2001 From: Ben Loftis Date: Wed, 11 May 2022 11:38:54 -0500 Subject: [PATCH] take Snap enablement into account when drawing new notes * snap_to_bbt assumes that snap is enabled and you want to snap to bbt * snap_to() is the generic form to snap to the user's snap+grid settings --- gtk2_ardour/editor_drag.cc | 4 +++- gtk2_ardour/midi_region_view.cc | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc index 9676d5776a..ebdca89815 100644 --- a/gtk2_ardour/editor_drag.cc +++ b/gtk2_ardour/editor_drag.cc @@ -6839,7 +6839,9 @@ NoteCreateDrag::~NoteCreateDrag () Temporal::Beats NoteCreateDrag::round_down_to_grid (timepos_t const & pos, GdkEvent const * event) const { - return _editor->snap_to_bbt (pos, RoundDownMaybe, SnapToGrid_Unscaled).beats (); + timepos_t snapped = pos; + _editor->snap_to (snapped, RoundDownMaybe, SnapToGrid_Unscaled); + return snapped.beats(); } void diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc index 688ecfc712..ff7b1f15cc 100644 --- a/gtk2_ardour/midi_region_view.cc +++ b/gtk2_ardour/midi_region_view.cc @@ -4092,7 +4092,8 @@ MidiRegionView::update_ghost_note (double x, double y, uint32_t state) PublicEditor& editor = trackview.editor (); samplepos_t const unsnapped_sample = editor.pixel_to_sample (global_x); - const Temporal::timepos_t snapped_pos = editor.snap_to_bbt (timepos_t (unsnapped_sample), RoundDownAlways, SnapToGrid_Unscaled); + Temporal::timepos_t snapped_pos = timepos_t (unsnapped_sample); + editor.snap_to (snapped_pos, RoundDownAlways, SnapToGrid_Unscaled); const Temporal::Beats snapped_beats = _region->position().distance (snapped_pos).beats (); /* prevent Percussive mode from displaying a ghost hit at region end */