Fixes to pointer constraints when copying in lock edit mode; make them behave the...

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@5841 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc
index 1bcd75e5e60483b02ff8ba629d958861a09fd7a6..83bb3bd5c677cc2cc80b4dc2603c6b5a98a44e56 100644 (file)
--- a/gtk2_ardour/editor_mouse.cc
+++ b/gtk2_ardour/editor_mouse.cc
@@ -3727,12 +3727,7 @@ Editor::region_drag_motion_callback (ArdourCanvas::Item* item, GdkEvent* event)
                bool x_move_allowed;
                
                if (Config->get_edit_mode() == Lock) {
-                       if (drag_info.copy) {
-                               x_move_allowed = !drag_info.x_constrained;
-                       } else {
-                               /* in locked edit mode, reverse the usual meaning of x_constrained */
-                               x_move_allowed = drag_info.x_constrained;
-                       }
+                       x_move_allowed = drag_info.x_constrained;
                } else {
                        x_move_allowed = !drag_info.x_constrained;
                }
@@ -3979,7 +3974,7 @@ Editor::region_drag_finished_callback (ArdourCanvas::Item* item, GdkEvent* event
           the drag.
        */
        
-       if (Config->get_edit_mode() == Lock && !drag_info.copy) {
+       if (Config->get_edit_mode() == Lock) {
                drag_info.x_constrained = !drag_info.x_constrained;
        }