From 37b680cd15ba0d7f902a19e56b6b4d324de535e9 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <carl@carlh.net>
Date: Wed, 22 Dec 2010 01:06:18 +0000
Subject: [PATCH] Fix region resizing with grid snapping enabled (#3620).

git-svn-id: svn://localhost/ardour2/branches/3.0@8325 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 gtk2_ardour/editor_drag.cc | 31 +++++++++++++++++++++++++++----
 gtk2_ardour/editor_drag.h  |  2 ++
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc
index 4845e8c918..ec480c4501 100644
--- a/gtk2_ardour/editor_drag.cc
+++ b/gtk2_ardour/editor_drag.cc
@@ -294,8 +294,9 @@ bool
 Drag::motion_handler (GdkEvent* event, bool from_autoscroll)
 {
 	/* check to see if we have moved in any way that matters since the last motion event */
-	if ( (!x_movement_matters() || _last_pointer_frame == adjusted_current_frame (event)) &&
-	     (!y_movement_matters() || _last_pointer_y == _drags->current_pointer_y ()) ) {
+	if (_move_threshold_passed &&
+	    (!x_movement_matters() || _last_pointer_frame == adjusted_current_frame (event)) &&
+	    (!y_movement_matters() || _last_pointer_y == _drags->current_pointer_y ()) ) {
 		return false;
 	}
 
@@ -305,7 +306,7 @@ Drag::motion_handler (GdkEvent* event, bool from_autoscroll)
 
 	if (!from_autoscroll && !_move_threshold_passed) {
 
-		bool const xp = (::llabs (adjusted_current_frame (event) - _grab_frame) >= threshold.first);
+		bool const xp = (::llabs (_drags->current_pointer_frame () - _grab_frame) >= threshold.first);
 		bool const yp = (::fabs ((_drags->current_pointer_y () - _grab_y)) >= threshold.second);
 
 		_move_threshold_passed = ((xp && x_movement_matters()) || (yp && y_movement_matters()));
@@ -1582,7 +1583,7 @@ TrimDrag::motion (GdkEvent* event, bool first_move)
 		speed = tv->track()->speed();
 	}
 
-	framecnt_t const dt = adjusted_current_frame (event) - grab_frame ();
+	framecnt_t const dt = adjusted_current_frame (event) - raw_grab_frame () + _pointer_frame_offset;
 
 	if (first_move) {
 
@@ -1756,6 +1757,28 @@ TrimDrag::aborted ()
 	}
 }
 
+void
+TrimDrag::setup_pointer_frame_offset ()
+{
+	list<DraggingView>::iterator i = _views.begin ();
+	while (i != _views.end() && i->view != _primary) {
+		++i;
+	}
+
+	if (i == _views.end()) {
+		return;
+	}
+
+	switch (_operation) {
+	case StartTrim:
+		_pointer_frame_offset = raw_grab_frame() - i->initial_position;
+		break;
+	case EndTrim:
+		_pointer_frame_offset = raw_grab_frame() - i->initial_end;
+		break;
+	}
+}
+
 MeterMarkerDrag::MeterMarkerDrag (Editor* e, ArdourCanvas::Item* i, bool c)
 	: Drag (e, i),
 	  _copy (c)
diff --git a/gtk2_ardour/editor_drag.h b/gtk2_ardour/editor_drag.h
index a3d3919fed..04d7150ee4 100644
--- a/gtk2_ardour/editor_drag.h
+++ b/gtk2_ardour/editor_drag.h
@@ -509,6 +509,8 @@ public:
 		return false;
 	}
 
+	void setup_pointer_frame_offset ();
+	
 private:
 
 	Operation _operation;