rework RegionMotionDrag so that we can actually drag a region to zero.

[ardour.git] / gtk2_ardour / editor_drag.cc

diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc
index 6d87599e89f40acf082dabd24e17cdd1415a487d..ac761dcb6cb13190ab9971d4933298677a961e2a 100644 (file)
--- a/gtk2_ardour/editor_drag.cc
+++ b/gtk2_ardour/editor_drag.cc
@@ -679,23 +679,19 @@ RegionMotionDrag::compute_x_delta (GdkEvent const * event, MusicFrame* pending_r
        if ((pending_region_position->frame != _last_position.frame) && x_move_allowed) {
 
                /* x movement since last time (in pixels) */
-               dx = (static_cast<double> (pending_region_position->frame) - _last_position.frame) / _editor->samples_per_pixel;
+               dx = _editor->sample_to_pixel_unrounded (pending_region_position->frame - _last_position.frame);
 
                /* total x movement */
-               framecnt_t total_dx = pending_region_position->frame;
-               if (regions_came_from_canvas()) {
-                       total_dx = total_dx - grab_frame ();
-               }
+               framecnt_t total_dx = _editor->pixel_to_sample (_total_x_delta + dx);
 
-               /* check that no regions have gone off the start of the session */
                for (list<DraggingView>::const_iterator i = _views.begin(); i != _views.end(); ++i) {
-                       if ((i->view->region()->position() + total_dx) < 0) {
-                               dx = 0;
-                               *pending_region_position = _last_position;
+                       frameoffset_t const off = i->view->region()->position() + total_dx;
+                       if (off < 0) {
+                               dx = dx - _editor->sample_to_pixel_unrounded (off);
+                               *pending_region_position = MusicFrame (pending_region_position->frame - off, 0);
                                break;
                        }
                }
-
        }
 
        return dx;
@@ -1982,7 +1978,9 @@ RegionInsertDrag::finished (GdkEvent * event, bool)
 
        _editor->begin_reversible_command (Operations::insert_region);
        playlist->clear_changes ();
-       playlist->add_region (_primary->region (), _last_position.frame, _editor->get_grid_music_divisions (event->button.state));
+       _editor->snap_to_with_modifier (_last_position, event);
+
+       playlist->add_region (_primary->region (), _last_position.frame, 1.0, false, _last_position.division);
 
        // Mixbus doesn't seem to ripple when inserting regions from the list: should we? yes, probably
        if (Config->get_edit_mode() == Ripple) {