smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-18 12:46:32 +01:00
Code Issues Projects Releases Wiki Activity

One drag at a time (#9217)

Browse source 
When a drag is already active, do not allow to start
another one. e.g. start a middle-click (fixed time drag),
then left-click.
This commit is contained in:
Robin Gareus 2023-02-07 02:57:58 +01:00
parent 2b64c4afe4
commit 48efbb4cc5
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
1 changed files with 11 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

11
gtk2_ardour/editor_mouse.cc
View file

@ -1107,6 +1107,10 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT
/* click on a normal region view */ /* click on a normal region view */
if (_drags->active ()) {
return true;
}
if (Keyboard::modifier_state_equals (event->button.state, ArdourKeyboard::slip_contents_modifier ())) { if (Keyboard::modifier_state_equals (event->button.state, ArdourKeyboard::slip_contents_modifier ())) {
if (!clicked_regionview->region()->locked() && (Config->get_edit_mode() != Lock)) { if (!clicked_regionview->region()->locked() && (Config->get_edit_mode() != Lock)) {
_drags->add (new RegionSlipContentsDrag (this, item, clicked_regionview, selection->regions.by_layer(), drag_time_domain (clicked_regionview->region()))); _drags->add (new RegionSlipContentsDrag (this, item, clicked_regionview, selection->regions.by_layer(), drag_time_domain (clicked_regionview->region())));
@ -1377,6 +1381,9 @@ Editor::button_press_handler_2 (ArdourCanvas::Item* item, GdkEvent* event, ItemT
Editing::MouseMode const eff = effective_mouse_mode (); Editing::MouseMode const eff = effective_mouse_mode ();
switch (eff) { switch (eff) {
case MouseObject: case MouseObject:
if (_drags->active ()) {
return true;
}
switch (item_type) { switch (item_type) {
case RegionItem: case RegionItem:
if (ArdourKeyboard::indicates_copy (event->button.state)) { if (ArdourKeyboard::indicates_copy (event->button.state)) {
@ -2655,6 +2662,8 @@ Editor::add_region_drag (ArdourCanvas::Item* item, GdkEvent*, RegionView* region
return; return;
} }
assert (!_drags->active ());
_drags->add (new RegionMoveDrag (this, item, region_view, selection->regions.by_layer(), copy, drag_time_domain (region_view->region()))); _drags->add (new RegionMoveDrag (this, item, region_view, selection->regions.by_layer(), copy, drag_time_domain (region_view->region())));
} }
@ -2667,6 +2676,8 @@ Editor::add_region_brush_drag (ArdourCanvas::Item* item, GdkEvent*, RegionView*
return; return;
} }
assert (!_drags->active ());
if (should_ripple()) { if (should_ripple()) {
return; return;
} }