smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-04 20:55:48 +01:00
Code Issues Projects Releases Wiki Activity

make unmodified drag on a range/time selection do a separate first, then drag the new region.

Browse source 
This behaviour is only superficially similar to Logic's behaviour. It also operates only on the FIRST selected
range's new region (the one created by the separate), rather than all of them. Extending it to operate on
all ranges (across tracks) is theoretically possible but has some complications that go beyond this simple change.

Dragging the selection itself now occurs on Primary-drag.
This commit is contained in:
Paul Davis 2014-09-24 15:50:59 -04:00
parent 4324b6b901
commit 935ee63ed3
1 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

25
gtk2_ardour/editor_mouse.cc
View file

@ -748,27 +748,27 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT
break;
case SelectionItem:
if (Keyboard::modifier_state_contains (event->button.state, Keyboard::ModifierMask(Keyboard::PrimaryModifier|Keyboard::SecondaryModifier))) {
start_selection_grab (item, event);
return true;
} else if (Keyboard::modifier_state_equals (event->button.state, Keyboard::SecondaryModifier)) {
if (Keyboard::modifier_state_equals (event->button.state, Keyboard::PrimaryModifier)) {
/* grab selection for moving */
_drags->set (new SelectionDrag (this, item, SelectionDrag::SelectionMove), event);
} else {
double const y = event->button.y;
pair<TimeAxisView*, int> tvp = trackview_by_y_position (y);
if (tvp.first) {
pair<TimeAxisView*, int> tvp = trackview_by_y_position (y);
if (tvp.first) {
AutomationTimeAxisView* atv = dynamic_cast<AutomationTimeAxisView*> (tvp.first);
if ( get_smart_mode() && atv) {
if (get_smart_mode() && atv) {
/* smart "join" mode: drag automation */
_drags->set (new AutomationRangeDrag (this, atv, selection->time), event, _cursors->up_down);
} else {
/* this was debated, but decided the more common action was to
make a new selection */
_drags->set (new SelectionDrag (this, item, SelectionDrag::CreateSelection), event);
}
}
}
separate-drag the selection. Well actually, Igor@Waves
decided this, so here it is.
*/
start_selection_grab (item, event);
return true;
}
}
}
break;
case StreamItem:
@ -2442,7 +2442,6 @@ Editor::start_selection_grab (ArdourCanvas::Item* /*item*/, GdkEvent* event)
}
/* XXX fix me one day to use all new regions */
boost::shared_ptr<Region> region (new_regions.front());
/* add it to the current stream/playlist.