ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

support group-override when starting a new Range selection

This commit is contained in:
Ben Loftis 2022-07-14 17:28:07 -05:00
parent 6089ae9314
commit 419f934ecd
4 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gtk2_ardour/editor.h
View File

@ -51,6 +51,7 @@
#include "gtkmm2ext/bindings.h" #include "gtkmm2ext/bindings.h"
#include "gtkmm2ext/dndtreeview.h" #include "gtkmm2ext/dndtreeview.h"
#include "pbd/controllable.h"
#include "pbd/stateful.h" #include "pbd/stateful.h"
#include "pbd/signals.h" #include "pbd/signals.h"
@ -830,7 +831,7 @@ private:
bool set_selected_control_point_from_click (bool press, Selection::Operation op = Selection::Set); bool set_selected_control_point_from_click (bool press, Selection::Operation op = Selection::Set);
void set_selected_track_from_click (bool press, Selection::Operation op = Selection::Set, bool no_remove=false); void set_selected_track_from_click (bool press, Selection::Operation op = Selection::Set, bool no_remove=false);
void set_selected_track_as_side_effect (Selection::Operation op); void set_selected_track_as_side_effect (Selection::Operation op, PBD::Controllable::GroupControlDisposition gcd = PBD::Controllable::UseGroup);
bool set_selected_regionview_from_click (bool press, Selection::Operation op = Selection::Set); bool set_selected_regionview_from_click (bool press, Selection::Operation op = Selection::Set);
bool set_selected_regionview_from_map_event (GdkEventAny*, StreamView*, boost::weak_ptr<ARDOUR::Region>); bool set_selected_regionview_from_map_event (GdkEventAny*, StreamView*, boost::weak_ptr<ARDOUR::Region>);

16
gtk2_ardour/editor_drag.cc
View File

@ -5388,6 +5388,12 @@ SelectionDrag::motion (GdkEvent* event, bool first_move)
_track_selection_at_start = _editor->selection->tracks; _track_selection_at_start = _editor->selection->tracks;
} }
/* in the case where there was no existing selection, we can check the group_ovveride */
PBD::Controllable::GroupControlDisposition gcd = PBD::Controllable::UseGroup;
if (ArdourKeyboard::is_group_override_event((GdkEventButton*)event) && _track_selection_at_start.empty()) {
gcd = PBD::Controllable::NoGroup;
}
switch (_operation) { switch (_operation) {
case CreateSelection: case CreateSelection:
{ {
@ -5416,18 +5422,16 @@ SelectionDrag::motion (GdkEvent* event, bool first_move)
if (first_move) { if (first_move) {
if (_add) { if (_add) {
/* adding to the selection */ /* adding to the selection */
_editor->set_selected_track_as_side_effect (Selection::Add); _editor->set_selected_track_as_side_effect (Selection::Add, gcd);
_editor->clicked_selection = _editor->selection->add (start, end); _editor->clicked_selection = _editor->selection->add (start, end);
_add = false; _add = false;
} else { } else {
/* new selection */ /* new selection */
if (_editor->clicked_axisview && !_editor->selection->selected (_editor->clicked_axisview)) { if (_editor->clicked_axisview && !_editor->selection->selected (_editor->clicked_axisview)) {
_editor->set_selected_track_as_side_effect (Selection::Set); _editor->set_selected_track_as_side_effect (Selection::Set, gcd);
} }
_editor->clicked_selection = _editor->selection->set (start, end); _editor->clicked_selection = _editor->selection->set (start, end);
@ -5472,7 +5476,7 @@ SelectionDrag::motion (GdkEvent* event, bool first_move)
tracks_to_remove.push_back (*i); tracks_to_remove.push_back (*i);
} else { } else {
RouteGroup* rg = (*i)->route_group(); RouteGroup* rg = (*i)->route_group();
if (rg && rg->is_active() && rg->is_select()) { if (rg && rg->is_active() && rg->is_select() && gcd != Controllable::NoGroup) {
selected_route_groups.push_back (rg); selected_route_groups.push_back (rg);
} }
} }
@ -5484,7 +5488,7 @@ SelectionDrag::motion (GdkEvent* event, bool first_move)
tracks_to_add.push_back (*i); tracks_to_add.push_back (*i);
RouteGroup* rg = (*i)->route_group(); RouteGroup* rg = (*i)->route_group();
if (rg && rg->is_active() && rg->is_select()) { if (rg && rg->is_active() && rg->is_select() && gcd != Controllable::NoGroup) {
selected_route_groups.push_back (rg); selected_route_groups.push_back (rg);
} }
} }

4
gtk2_ardour/editor_mouse.cc
View File

@ -937,7 +937,7 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT
break; break;
case StreamItem: case StreamItem:
if (Keyboard::modifier_state_equals (event->button.state, Keyboard::RangeSelectModifier)) { if (Keyboard::modifier_state_equals (event->button.state, Keyboard::RangeSelectModifier) && !selection->time.empty()) {
_drags->set (new SelectionDrag (this, item, SelectionDrag::SelectionExtend), event); _drags->set (new SelectionDrag (this, item, SelectionDrag::SelectionExtend), event);
} else { } else {
_drags->set (new SelectionDrag (this, item, SelectionDrag::CreateSelection), event); _drags->set (new SelectionDrag (this, item, SelectionDrag::CreateSelection), event);
@ -953,7 +953,7 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT
break; break;
default: default:
if (Keyboard::modifier_state_equals (event->button.state, Keyboard::RangeSelectModifier)) { if (Keyboard::modifier_state_equals (event->button.state, Keyboard::RangeSelectModifier) && !selection->time.empty()) {
_drags->set (new SelectionDrag (this, item, SelectionDrag::SelectionExtend), event); _drags->set (new SelectionDrag (this, item, SelectionDrag::SelectionExtend), event);
} else { } else {
_drags->set (new SelectionDrag (this, item, SelectionDrag::CreateSelection), event); _drags->set (new SelectionDrag (this, item, SelectionDrag::CreateSelection), event);

10
gtk2_ardour/editor_selection.cc
View File

@ -205,7 +205,7 @@ Editor::select_all_visible_lanes ()
* tracks, in which case nothing will happen unless `force' is true. * tracks, in which case nothing will happen unless `force' is true.
*/ */
void void
Editor::set_selected_track_as_side_effect (Selection::Operation op) Editor::set_selected_track_as_side_effect (Selection::Operation op, Controllable::GroupControlDisposition gcd)
{ {
if (!clicked_axisview) { if (!clicked_axisview) {
return; return;
@ -223,7 +223,7 @@ Editor::set_selected_track_as_side_effect (Selection::Operation op)
if (selection->selected (clicked_axisview)) { if (selection->selected (clicked_axisview)) {
if (group && group->is_active() && group->enabled_property(ARDOUR::Properties::group_select.property_id)) { if (group && group->is_active() && group->enabled_property(ARDOUR::Properties::group_select.property_id)) {
for (TrackViewList::iterator i = track_views.begin(); i != track_views.end (); ++i) { for (TrackViewList::iterator i = track_views.begin(); i != track_views.end (); ++i) {
if ((*i)->route_group() == group) { if ((*i)->route_group() == group && gcd != Controllable::NoGroup) {
selection->remove(*i); selection->remove(*i);
} }
} }
@ -233,7 +233,7 @@ Editor::set_selected_track_as_side_effect (Selection::Operation op)
} else { } else {
if (group && group->is_active() && group->enabled_property(ARDOUR::Properties::group_select.property_id)) { if (group && group->is_active() && group->enabled_property(ARDOUR::Properties::group_select.property_id)) {
for (TrackViewList::iterator i = track_views.begin(); i != track_views.end (); ++i) { for (TrackViewList::iterator i = track_views.begin(); i != track_views.end (); ++i) {
if ((*i)->route_group() == group) { if ((*i)->route_group() == group && gcd != Controllable::NoGroup) {
selection->add(*i); selection->add(*i);
} }
} }
@ -246,7 +246,7 @@ Editor::set_selected_track_as_side_effect (Selection::Operation op)
case Selection::Add: case Selection::Add:
if (group && group->is_active() && group->enabled_property(ARDOUR::Properties::group_select.property_id)) { if (group && group->is_active() && group->enabled_property(ARDOUR::Properties::group_select.property_id)) {
for (TrackViewList::iterator i = track_views.begin(); i != track_views.end (); ++i) { for (TrackViewList::iterator i = track_views.begin(); i != track_views.end (); ++i) {
if ((*i)->route_group() == group) { if ((*i)->route_group() == group && gcd != Controllable::NoGroup) {
selection->add(*i); selection->add(*i);
} }
} }
@ -259,7 +259,7 @@ Editor::set_selected_track_as_side_effect (Selection::Operation op)
selection->clear(); selection->clear();
if (group && group->is_active() && group->enabled_property(ARDOUR::Properties::group_select.property_id)) { if (group && group->is_active() && group->enabled_property(ARDOUR::Properties::group_select.property_id)) {
for (TrackViewList::iterator i = track_views.begin(); i != track_views.end (); ++i) { for (TrackViewList::iterator i = track_views.begin(); i != track_views.end (); ++i) {
if ((*i)->route_group() == group) { if ((*i)->route_group() == group && gcd != Controllable::NoGroup) {
selection->add(*i); selection->add(*i);
} }
} }