diff options
| author | nick_m <mainsbridge@gmail.com> | 2015-05-19 03:27:50 +1000 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2015-05-19 03:27:50 +1000 |
| commit | dc50730059771b4b2899ffb4c3b5ef49d5ffae91 (patch) | |
| tree | 172dcfbf00268f24787cf400ed44f2982fd6c27a /gtk2_ardour/editor_drag.cc | |
| parent | aac167a19f32accfbd867f3c72cec13f374f9199 (diff) | |
Revert to old Lock mode (still called Lock).
Also make midi notes obey the snap delta modifire
Diffstat (limited to 'gtk2_ardour/editor_drag.cc')
| -rw-r--r-- | gtk2_ardour/editor_drag.cc | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc index cf1f8007b9..0e75c48cdb 100644 --- a/gtk2_ardour/editor_drag.cc +++ b/gtk2_ardour/editor_drag.cc @@ -401,21 +401,25 @@ Drag::motion_handler (GdkEvent* event, bool from_autoscroll) /* just changed */ if (fabs (current_pointer_y() - _grab_y) > fabs (current_pointer_x() - _grab_x)) { - if ((event->motion.state & Gdk::BUTTON2_MASK) || Config->get_edit_mode() == Constrained) { + if ((event->motion.state & Gdk::BUTTON2_MASK) && Config->get_edit_mode() != Lock) { _x_constrained = true; _y_constrained = false; } _initially_vertical = true; } else { - if ((event->motion.state & Gdk::BUTTON2_MASK) || Config->get_edit_mode() == Constrained) { + if ((event->motion.state & Gdk::BUTTON2_MASK) && Config->get_edit_mode() != Lock) { _x_constrained = false; _y_constrained = true; } _initially_vertical = false; } - if ((event->motion.state & Gdk::BUTTON2_MASK) && Config->get_edit_mode() == Constrained) { - _x_constrained = false; + if (Config->get_edit_mode() == Lock) { + if (event->button.state & Gdk::BUTTON2_MASK) { + _x_constrained = false; + } else { + _x_constrained = true; + } _y_constrained = false; } } @@ -635,7 +639,8 @@ RegionMotionDrag::compute_x_delta (GdkEvent const * event, framepos_t* pending_r } double dx = 0; - bool x_move_allowed = !_x_constrained; + + bool const x_move_allowed = !_x_constrained; if ((*pending_region_position != _last_frame_position) && x_move_allowed) { @@ -2389,7 +2394,7 @@ NoteResizeDrag::motion (GdkEvent* event, bool /*first_move*/) MidiRegionView* mrv = dynamic_cast<MidiRegionView*>(*r); if (mrv) { double sd = 0.0; - if (Keyboard::modifier_state_contains (event->button.state, Keyboard::TertiaryModifier)) { + if (!Keyboard::modifier_state_equals (event->button.state, Keyboard::snap_delta_modifier())) { sd = _snap_delta; } mrv->update_resizing (nb, at_front, _drags->current_pointer_x() - grab_x(), relative, sd); @@ -2406,7 +2411,7 @@ NoteResizeDrag::finished (GdkEvent* event, bool /*movement_occurred*/) assert (nb); MidiRegionView* mrv = dynamic_cast<MidiRegionView*>(*r); double sd = 0.0; - if (Keyboard::modifier_state_contains (event->button.state, Keyboard::TertiaryModifier)) { + if (!Keyboard::modifier_state_equals (event->button.state, Keyboard::snap_delta_modifier())) { sd = _snap_delta; } if (mrv) { |