From 727620ca003db0e39c4e42908cedcb2caab2afa3 Mon Sep 17 00:00:00 2001 From: GZharun Date: Tue, 9 Dec 2014 14:06:06 +0200 Subject: [PATCH] [Summary] Changed cursor during range trimming to Range Tool cursor, made range trimming possible only if Shift key is pressed --- gtk2_ardour/editor_drag.cc | 4 ++-- gtk2_ardour/editor_mouse.cc | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc index 593157ce93..ef16b34839 100644 --- a/gtk2_ardour/editor_drag.cc +++ b/gtk2_ardour/editor_drag.cc @@ -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: diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc index e99f95886c..d125ed2cf2 100644 --- a/gtk2_ardour/editor_mouse.cc +++ b/gtk2_ardour/editor_mouse.cc @@ -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: