Make Cut mode respect snap modifer

[ardour.git] / gtk2_ardour / editor_drag.cc

diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc
index 4cba008f5ffc03de0ff905e0830e6545a21b570f..4e52649850872b6f96804d820a251e9a5e50ae63 100644 (file)
--- a/gtk2_ardour/editor_drag.cc
+++ b/gtk2_ardour/editor_drag.cc
@@ -6518,6 +6518,7 @@ RegionCutDrag::RegionCutDrag (Editor* e, ArdourCanvas::Item* item, framepos_t po
 {
        line->set_position (pos);
        line->show ();
+       line->track_canvas_item().reparent (_editor->_drag_motion_group);
 }
 
 RegionCutDrag::~RegionCutDrag ()
@@ -6526,12 +6527,19 @@ RegionCutDrag::~RegionCutDrag ()
 }
 
 void
-RegionCutDrag::motion (GdkEvent*, bool)
+RegionCutDrag::start_grab (GdkEvent* event, Gdk::Cursor* c)
 {
-       framepos_t where = _drags->current_pointer_frame();
-       _editor->snap_to (where);
+       Drag::start_grab (event, c);
+       motion (event, false);
+}
+
+void
+RegionCutDrag::motion (GdkEvent* event, bool)
+{
+       framepos_t pos = _drags->current_pointer_frame();
+       _editor->snap_to_with_modifier (pos, event);
 
-       line->set_position (where);
+       line->set_position (pos);
 }
 
 void
@@ -6540,6 +6548,7 @@ RegionCutDrag::finished (GdkEvent* event, bool)
        _editor->get_track_canvas()->canvas()->re_enter();
 
        framepos_t pos = _drags->current_pointer_frame();
+       _editor->snap_to_with_modifier (pos, event);
 
        line->hide ();
 
@@ -6549,7 +6558,8 @@ RegionCutDrag::finished (GdkEvent* event, bool)
                return;
        }
 
-       _editor->split_regions_at (pos, rs, _editor->get_grid_music_divisions (event->button.state));
+       _editor->split_regions_at (pos, rs, _editor->get_grid_music_divisions (event->button.state),
+                                  false);
 }
 
 void