Revert last commit (269a08a2b1).

diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc
index 07f6c23d71e7e4d2dc7c723d0c9713718ccc4dd7..98ccf4a6a28f05e2aae5d854847eda8af1546f18 100644 (file)
--- a/gtk2_ardour/editor_drag.cc
+++ b/gtk2_ardour/editor_drag.cc
@@ -264,15 +264,6 @@ Drag::start_grab (GdkEvent* event, Gdk::Cursor *cursor)
        /* we set up x/y dragging constraints on first move */
        _constraint_pressed = ArdourKeyboard::indicates_constraint (event->button.state);
 
-       if (_constraint_pressed) {
-               /* if constraint was indicated at the beginning of the drag, constrain x.
-                  if the user presses these modifiers after this point in time (first move),
-                  the drag will be constrained to the first direction of motion.
-               */
-               _x_constrained = true;
-               _y_constrained = false;
-       }
-
        _raw_grab_frame = _editor->canvas_event_sample (event, &_grab_x, &_grab_y);
 
        setup_pointer_frame_offset ();
@@ -438,7 +429,7 @@ Drag::motion_handler (GdkEvent* event, bool from_autoscroll)
                                                        _x_constrained = true;
                                                        _y_constrained = false;
                                                }
-                                       } else if (!_constraint_pressed && ArdourKeyboard::indicates_constraint (event->button.state)) {
+                                       } else if (_constraint_pressed) {
                                                // if dragging normally, the motion is constrained to the first direction of movement.
                                                if (_initially_vertical) {
                                                        _x_constrained = true;

diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc
index 6296793b4600c7a2f629bdcda24663c219d34f7f..7596c6fb530f5f95ba8acafa878bc87e30a62619 100644 (file)
--- a/gtk2_ardour/rc_option_editor.cc
+++ b/gtk2_ardour/rc_option_editor.cc
@@ -545,9 +545,7 @@ public:
                _constraint_modifier_combo.signal_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::constraint_modifier_chosen));
                std::string mod_str = string_compose (X_("%1-%2"), Keyboard::primary_modifier_name (), Keyboard::level4_modifier_name ());
                Gtkmm2ext::UI::instance()->set_tip (_constraint_modifier_combo,
-                                                   (string_compose (_("At the beginning of a drag, applies vertical constraint (mostly)."
-                                                                      " Holding down after grabbing an object but before the first move constrains the"
-                                                                      " drag to the direction of the first movement. <b>Recommended Setting: %1</b>%2"),
+                                                   (string_compose (_("<b>Recommended Setting: %1</b>%2"),
 #ifdef __APPLE__
                                                                     Keyboard::primary_modifier_name (),
 #else