[Summary] Changed cursor during range trimming to Range Tool cursor, made range trimming possible only if Shift key is pressed

This commit is contained in:
GZharun 2014-12-09 14:06:06 +02:00
parent 878320df4b
commit 727620ca00
2 changed files with 8 additions and 4 deletions

View file

@ -4145,14 +4145,14 @@ SelectionDrag::start_grab (GdkEvent* event, Gdk::Cursor*)
if (_editor->clicked_axisview) {
_editor->clicked_axisview->order_selection_trims (_item, true);
}
Drag::start_grab (event, _editor->cursors()->left_side_trim);
Drag::start_grab (event, cursor);
break;
case SelectionEndTrim:
if (_editor->clicked_axisview) {
_editor->clicked_axisview->order_selection_trims (_item, false);
}
Drag::start_grab (event, _editor->cursors()->right_side_trim);
Drag::start_grab (event, cursor);
break;
case SelectionMove:

View file

@ -745,11 +745,15 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT
case MouseRange:
switch (item_type) {
case StartSelectionTrimItem:
_drags->set (new SelectionDrag (this, item, SelectionDrag::SelectionStartTrim), event);
if (Keyboard::modifier_state_equals (event->button.state, Keyboard::Keyboard::TertiaryModifier) ) {
_drags->set (new SelectionDrag (this, item, SelectionDrag::SelectionStartTrim), event);
}
break;
case EndSelectionTrimItem:
_drags->set (new SelectionDrag (this, item, SelectionDrag::SelectionEndTrim), event);
if (Keyboard::modifier_state_equals (event->button.state, Keyboard::Keyboard::TertiaryModifier) ) {
_drags->set (new SelectionDrag (this, item, SelectionDrag::SelectionEndTrim), event);
}
break;
case SelectionItem: