{
// if dragging with button2, the motion is x constrained, with Alt-button2 it is y constrained
- if (Keyboard::is_button2_event (&event->button)) {
- if (Keyboard::modifier_state_equals (event->button.state, Keyboard::SecondaryModifier)) {
- _y_constrained = true;
- _x_constrained = false;
- } else {
- _y_constrained = false;
- _x_constrained = true;
- }
- } else {
- _x_constrained = false;
- _y_constrained = false;
- }
+ /* we set up x/y dragging constraints on first move */
+ _x_constrained = false;
+ _y_constrained = false;
_raw_grab_frame = _editor->canvas_event_sample (event, &_grab_x, &_grab_y);
return adjusted_frame (_drags->current_pointer_frame (), event, snap);
}
+frameoffset_t
+Drag::snap_delta (GdkEvent const * event) const
+{
+ if (Keyboard::modifier_state_equals (event->button.state, Keyboard::snap_delta_modifier())) {
+ return 0;
+ } else {
+ return _snap_delta;
+ }
+}
+
double
Drag::current_pointer_x() const
{
void
Drag::setup_snap_delta (framepos_t pos)
{
- if (_editor->snap_delta () == SnapRelative) {
- framepos_t temp = pos;
- _editor->snap_to_no_magnets (temp);
- _snap_delta = temp - pos;
- }
+ framepos_t temp = pos;
+ _editor->snap_to_no_magnets (temp);
+ _snap_delta = temp - pos;
}
bool
/* 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() != Lock) {
+ _x_constrained = true;
+ _y_constrained = false;
+ }
_initially_vertical = true;
} else {
+ if ((event->motion.state & Gdk::BUTTON2_MASK) && Config->get_edit_mode() != Lock) {
+ _x_constrained = false;
+ _y_constrained = true;
+ }
_initially_vertical = false;
}
+
+ if (Config->get_edit_mode() == Lock) {
+ if (event->button.state & Gdk::BUTTON2_MASK) {
+ _x_constrained = false;
+ } else {
+ _x_constrained = true;
+ }
+ _y_constrained = false;
+ }
}
if (!from_autoscroll) {
, _total_x_delta (0)
, _last_pointer_time_axis_view (0)
, _last_pointer_layer (0)
- , _single_axis (false)
, _ndropzone (0)
, _pdropzone (0)
, _ddropzone (0)
Drag::start_grab (event, cursor);
setup_snap_delta (_last_frame_position);
- if (Keyboard::modifier_state_contains (event->button.state, Keyboard::TertiaryModifier)) {
- _single_axis = true;
- }
-
show_verbose_cursor_time (_last_frame_position);
pair<TimeAxisView*, double> const tv = _editor->trackview_by_y_position (current_pointer_y ());
/* compute the amount of pointer motion in frames, and where
the region would be if we moved it by that much.
*/
- *pending_region_position = adjusted_frame (_drags->current_pointer_frame () + snap_delta (), event, true);
+ *pending_region_position = adjusted_frame (_drags->current_pointer_frame () + snap_delta (event), event, true);
framepos_t sync_frame;
framecnt_t sync_offset;
_editor->snap_to_with_modifier (sync_frame, event);
- *pending_region_position = _primary->region()->adjust_to_sync (sync_frame) - snap_delta ();
+ *pending_region_position = _primary->region()->adjust_to_sync (sync_frame) - snap_delta (event);
} else {
*pending_region_position = _last_frame_position;
double dx = 0;
- /* in locked edit mode, reverse the usual meaning of _x_constrained */
- bool const x_move_allowed = Config->get_edit_mode() == Lock ? _x_constrained : !_x_constrained;
+ bool const x_move_allowed = !_x_constrained;
if ((*pending_region_position != _last_frame_position) && x_move_allowed) {
assert (!_views.empty ());
- if (first_move) {
- if (_single_axis) {
- if (initially_vertical()) {
- _y_constrained = false;
- _x_constrained = true;
- } else {
- _y_constrained = true;
- _x_constrained = false;
- }
- }
- }
-
/* Note: time axis views in this method are often expressed as an index into the _time_axis_views vector */
/* Find the TimeAxisView that the pointer is now over */
return;
}
- /* reverse this here so that we have the correct logic to finalize
- the drag.
- */
-
- if (Config->get_edit_mode() == Lock) {
- _x_constrained = !_x_constrained;
- }
-
assert (!_views.empty ());
/* We might have hidden region views so that they weren't visible during the drag
region = &cnote->region_view();
- if (_editor->snap_delta () == SnapRelative) {
- double temp;
- temp = region->snap_to_pixel_no_magnets (cnote->x0 ());
- _snap_delta = temp - cnote->x0 ();
- }
+ double temp;
+ temp = region->snap_to_pixel_no_magnets (cnote->x0 ());
+ _snap_delta = temp - cnote->x0 ();
_item->grab ();
}
void
-NoteResizeDrag::motion (GdkEvent* /*event*/, bool /*first_move*/)
+NoteResizeDrag::motion (GdkEvent* event, bool /*first_move*/)
{
MidiRegionSelection& ms (_editor->get_selection().midi_regions);
for (MidiRegionSelection::iterator r = ms.begin(); r != ms.end(); ++r) {
assert (nb);
MidiRegionView* mrv = dynamic_cast<MidiRegionView*>(*r);
if (mrv) {
- mrv->update_resizing (nb, at_front, _drags->current_pointer_x() - grab_x(), relative, _snap_delta);
+ double sd = 0.0;
+ 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);
}
}
}
void
-NoteResizeDrag::finished (GdkEvent*, bool /*movement_occurred*/)
+NoteResizeDrag::finished (GdkEvent* event, bool /*movement_occurred*/)
{
MidiRegionSelection& ms (_editor->get_selection().midi_regions);
for (MidiRegionSelection::iterator r = ms.begin(); r != ms.end(); ++r) {
NoteBase* nb = reinterpret_cast<NoteBase*> (_item->get_data ("notebase"));
assert (nb);
MidiRegionView* mrv = dynamic_cast<MidiRegionView*>(*r);
+ double sd = 0.0;
+ if (!Keyboard::modifier_state_equals (event->button.state, Keyboard::snap_delta_modifier())) {
+ sd = _snap_delta;
+ }
if (mrv) {
- mrv->commit_resizing (nb, at_front, _drags->current_pointer_x() - grab_x(), relative, _snap_delta);
+ mrv->commit_resizing (nb, at_front, _drags->current_pointer_x() - grab_x(), relative, sd);
}
}
TrimDrag::TrimDrag (Editor* e, ArdourCanvas::Item* i, RegionView* p, list<RegionView*> const & v, bool preserve_fade_anchor)
: RegionDrag (e, i, p, v)
, _preserve_fade_anchor (preserve_fade_anchor)
- , _jump_position_when_done (false)
{
DEBUG_TRACE (DEBUG::Drags, "New TrimDrag\n");
}
framepos_t const pf = adjusted_current_frame (event);
setup_snap_delta (region_start);
- if (Keyboard::modifier_state_equals (event->button.state, Keyboard::PrimaryModifier)) {
+ if (Keyboard::modifier_state_equals (event->button.state, Keyboard::SecondaryModifier)) {
/* Move the contents of the region around without changing the region bounds */
_operation = ContentsTrim;
Drag::start_grab (event, _editor->cursors()->trimmer);
if (pf < (region_start + region_length/2)) {
/* closer to front */
_operation = StartTrim;
-
- if (Keyboard::modifier_state_equals (event->button.state, Keyboard::TertiaryModifier)) {
+ if (Keyboard::modifier_state_equals (event->button.state, Keyboard::PrimaryModifier)) {
Drag::start_grab (event, _editor->cursors()->anchored_left_side_trim);
} else {
Drag::start_grab (event, _editor->cursors()->left_side_trim);
} else {
/* closer to end */
_operation = EndTrim;
- if (Keyboard::modifier_state_equals (event->button.state, Keyboard::TertiaryModifier)) {
+ if (Keyboard::modifier_state_equals (event->button.state, Keyboard::PrimaryModifier)) {
Drag::start_grab (event, _editor->cursors()->anchored_right_side_trim);
} else {
Drag::start_grab (event, _editor->cursors()->right_side_trim);
}
}
- if (Keyboard::modifier_state_equals (event->button.state, Keyboard::TertiaryModifier)) {
- _jump_position_when_done = true;
- }
-
switch (_operation) {
case StartTrim:
show_verbose_cursor_time (region_start);
if (tv && tv->is_track()) {
speed = tv->track()->speed();
}
- framecnt_t adj_frame = adjusted_frame (_drags->current_pointer_frame () + snap_delta (), event, true);
- framecnt_t dt = adj_frame - raw_grab_frame () + _pointer_frame_offset - snap_delta ();
+ framecnt_t adj_frame = adjusted_frame (_drags->current_pointer_frame () + snap_delta (event), event, true);
+ framecnt_t dt = adj_frame - raw_grab_frame () + _pointer_frame_offset - snap_delta (event);
if (first_move) {
bool non_overlap_trim = false;
- if (event && Keyboard::modifier_state_equals (event->button.state, Keyboard::TertiaryModifier)) {
+ if (event && Keyboard::modifier_state_equals (event->button.state, Keyboard::ModifierMask (Keyboard::PrimaryModifier | Keyboard::TertiaryModifier))) {
non_overlap_trim = true;
}
}
}
-
void
TrimDrag::finished (GdkEvent* event, bool movement_occurred)
{
ar->set_fade_in_active(true);
}
}
- if (_jump_position_when_done) {
- i->view->region()->set_position (i->initial_position);
- }
}
} else if (_operation == EndTrim) {
for (list<DraggingView>::const_iterator i = _views.begin(); i != _views.end(); ++i) {
ar->set_fade_out_active(true);
}
}
- if (_jump_position_when_done) {
- i->view->region()->set_position (i->initial_end - i->view->region()->length());
- }
}
}
_grab_zoom = _editor->samples_per_pixel;
- framepos_t where = _editor->canvas_event_sample (event) + snap_delta ();
+ framepos_t where = _editor->canvas_event_sample (event) + snap_delta (event);
_editor->snap_to_with_modifier (where, event);
}
}
- fake_locate (where - snap_delta ());
+ fake_locate (where - snap_delta (event));
}
void
CursorDrag::motion (GdkEvent* event, bool)
{
- framepos_t where = _editor->canvas_event_sample (event) + snap_delta ();
+ framepos_t where = _editor->canvas_event_sample (event) + snap_delta (event);
_editor->snap_to_with_modifier (where, event);
if (where != last_pointer_frame()) {
- fake_locate (where - snap_delta ());
+ fake_locate (where - snap_delta (event));
}
}
{
framecnt_t fade_length;
- framepos_t pos = _editor->canvas_event_sample (event) + snap_delta ();
+ framepos_t pos = _editor->canvas_event_sample (event) + snap_delta (event);
_editor->snap_to_with_modifier (pos, event);
- pos -= snap_delta ();
+ pos -= snap_delta (event);
boost::shared_ptr<AudioRegion> region = boost::dynamic_pointer_cast<AudioRegion> (_primary->region ());
}
framecnt_t fade_length;
- framepos_t pos = _editor->canvas_event_sample (event) + snap_delta ();
+ framepos_t pos = _editor->canvas_event_sample (event) + snap_delta (event);
_editor->snap_to_with_modifier (pos, event);
- pos -= snap_delta ();
+ pos -= snap_delta (event);
boost::shared_ptr<AudioRegion> region = boost::dynamic_pointer_cast<AudioRegion> (_primary->region ());
{
framecnt_t fade_length;
- framepos_t pos = _editor->canvas_event_sample (event) + snap_delta ();
+ framepos_t pos = _editor->canvas_event_sample (event) + snap_delta (event);
_editor->snap_to_with_modifier (pos, event);
- pos -= snap_delta ();
+ pos -= snap_delta (event);
boost::shared_ptr<AudioRegion> region = boost::dynamic_pointer_cast<AudioRegion> (_primary->region ());
framecnt_t fade_length;
- framepos_t pos = _editor->canvas_event_sample (event) + snap_delta ();
+ framepos_t pos = _editor->canvas_event_sample (event) + snap_delta (event);
_editor->snap_to_with_modifier (pos, event);
- pos -= snap_delta ();
+ pos -= snap_delta (event);
boost::shared_ptr<AudioRegion> region = boost::dynamic_pointer_cast<AudioRegion> (_primary->region ());
cy = max (0.0, cy);
cy = min ((double) _point->line().height(), cy);
- framepos_t cx_frames = _editor->pixel_to_sample (cx) + snap_delta ();
+ framepos_t cx_frames = _editor->pixel_to_sample (cx) + snap_delta (event);
if (!_x_constrained) {
_editor->snap_to_with_modifier (cx_frames, event);
}
- cx_frames -= snap_delta ();
+ cx_frames -= snap_delta (event);
cx_frames = min (cx_frames, _point->line().maximum_time());
float const fraction = 1.0 - (cy / _point->line().height());
if (!movement_occurred) {
/* just a click */
-
- if (Keyboard::modifier_state_equals (event->button.state, Keyboard::TertiaryModifier)) {
+ if (Keyboard::modifier_state_equals (event->button.state, Keyboard::ModifierMask (Keyboard::PrimaryModifier | Keyboard::TertiaryModifier))) {
_editor->reset_point_selection ();
}
pair<TimeAxisView*, double> const tv = _editor->trackview_by_y_position (grab_y());
int layer = tv.first->layer_display() == Overlaid ? 0 : tv.second;
int layers = tv.first->layer_display() == Overlaid ? 1 : cv->layers();
- framepos_t pf = _editor->canvas_event_sample (event) + snap_delta ();
+ framepos_t pf = _editor->canvas_event_sample (event) + snap_delta (event);
_editor->snap_to_with_modifier (pf, event);
- pf -= snap_delta ();
+ pf -= snap_delta (event);
if (pf > rv->region()->position()) {
rv->get_time_axis_view().show_timestretch (rv->region()->position(), pf, layers, layer);
/** @return Current total drag x change in frames */
frameoffset_t
-NoteDrag::total_dx () const
+NoteDrag::total_dx (GdkEvent const * event) const
{
/* dx in frames */
frameoffset_t const dx = _editor->pixel_to_sample (_drags->current_pointer_x() - grab_x());
frameoffset_t const n = _region->source_beats_to_absolute_frames (_primary->note()->time ());
/* new time of the primary note in session frames */
- frameoffset_t st = n + dx + snap_delta ();
+ frameoffset_t st = n + dx + snap_delta (event);
framepos_t const rp = _region->region()->position ();
st = max (st, rp);
/* snap and return corresponding delta */
- return _region->snap_frame_to_frame (st - rp) + rp - n - snap_delta ();
+ return _region->snap_frame_to_frame (st - rp) + rp - n - snap_delta (event);
}
/** @return Current total drag y change in note number */
}
void
-NoteDrag::motion (GdkEvent *, bool)
+NoteDrag::motion (GdkEvent * event, bool)
{
/* Total change in x and y since the start of the drag */
- frameoffset_t const dx = total_dx ();
+ frameoffset_t const dx = total_dx (event);
int8_t const dy = total_dy ();
/* Now work out what we have to do to the note canvas items to set this new drag delta */
}
}
} else {
- _region->note_dropped (_primary, total_dx(), total_dy());
+ _region->note_dropped (_primary, total_dx (ev), total_dy());
}
}