Track selection as a side-effect of a Range selection should obey group->selection property
This commit is contained in:
parent
b17629bddf
commit
537d44e3ae
@ -221,7 +221,7 @@ Editor::set_selected_track_as_side_effect (Selection::Operation op)
|
|||||||
switch (op) {
|
switch (op) {
|
||||||
case Selection::Toggle:
|
case Selection::Toggle:
|
||||||
if (selection->selected (clicked_axisview)) {
|
if (selection->selected (clicked_axisview)) {
|
||||||
if (group && group->is_active()) {
|
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) {
|
||||||
selection->remove(*i);
|
selection->remove(*i);
|
||||||
@ -231,7 +231,7 @@ Editor::set_selected_track_as_side_effect (Selection::Operation op)
|
|||||||
selection->remove (clicked_axisview);
|
selection->remove (clicked_axisview);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (group && group->is_active()) {
|
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) {
|
||||||
selection->add(*i);
|
selection->add(*i);
|
||||||
@ -244,7 +244,7 @@ Editor::set_selected_track_as_side_effect (Selection::Operation op)
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
case Selection::Add:
|
case Selection::Add:
|
||||||
if (group && group->is_active()) {
|
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) {
|
||||||
selection->add(*i);
|
selection->add(*i);
|
||||||
@ -257,7 +257,7 @@ Editor::set_selected_track_as_side_effect (Selection::Operation op)
|
|||||||
|
|
||||||
case Selection::Set:
|
case Selection::Set:
|
||||||
selection->clear();
|
selection->clear();
|
||||||
if (group && group->is_active()) {
|
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) {
|
||||||
selection->add(*i);
|
selection->add(*i);
|
||||||
|
Loading…
Reference in New Issue
Block a user