diff options
| author | nick_m <mainsbridge@gmail.com> | 2016-08-20 01:58:56 +1000 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2016-08-20 01:58:56 +1000 |
| commit | 0444ce1d5efb523fa5f9bf1e793c5123b3b5f4d3 (patch) | |
| tree | d7ad953dbbec2c336721d0d1de2b5b19a1193b9f /gtk2_ardour | |
| parent | 269a08a2b1cdf1f72c49c715f85ead2e16911854 (diff) | |
Revert last commit (269a08a2b1).
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/editor_drag.cc | 11 | ||||
| -rw-r--r-- | gtk2_ardour/rc_option_editor.cc | 4 |
2 files changed, 2 insertions, 13 deletions
diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc index 07f6c23d71..98ccf4a6a2 100644 --- 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 6296793b46..7596c6fb53 100644 --- 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 |