1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-10-30 17:23:51 +01:00

Revert "Bug 2547 - Shift + Click may select incorrect tracks"

This reverts commit 0c234359af.

Will need to find another way and have discussion as pointed out
in bug #2547.
This commit is contained in:
Leland Lucius
2021-02-14 03:43:17 -06:00
parent f1b43fd642
commit 5f68102dc5

View File

@@ -170,10 +170,6 @@ void DoPrevTrack(
{ {
auto range = tracks.Leaders(); auto range = tracks.Leaders();
p = * range.rbegin(); // null if range is empty p = * range.rbegin(); // null if range is empty
// Deselect all other tracks and select this one.
selectionState.SelectNone( tracks );
selectionState.SelectTrack( *p, true, true );
trackFocus.Set( p ); // Wrap to the last track trackFocus.Set( p ); // Wrap to the last track
if (p) if (p)
p->EnsureVisible( true ); p->EnsureVisible( true );
@@ -187,9 +183,6 @@ void DoPrevTrack(
} }
else else
{ {
// Deselect all other tracks and select this one.
selectionState.SelectNone( tracks );
selectionState.SelectTrack( *p, true, true );
trackFocus.Set( p ); // move focus to next track up trackFocus.Set( p ); // move focus to next track up
p->EnsureVisible( true ); p->EnsureVisible( true );
return; return;
@@ -212,9 +205,6 @@ void DoNextTrack(
if( t == NULL ) // if there isn't one, focus on first if( t == NULL ) // if there isn't one, focus on first
{ {
t = *tracks.Any().begin(); t = *tracks.Any().begin();
// Deselect all other tracks and select this one.
selectionState.SelectNone( tracks );
selectionState.SelectTrack( *t, true, true );
trackFocus.Set( t ); trackFocus.Set( t );
if (t) if (t)
t->EnsureVisible( true ); t->EnsureVisible( true );
@@ -283,10 +273,6 @@ void DoNextTrack(
if( circularTrackNavigation ) if( circularTrackNavigation )
{ {
n = *tracks.Any().begin(); n = *tracks.Any().begin();
// Deselect all other tracks and select this one.
selectionState.SelectNone( tracks );
selectionState.SelectTrack( *n, true, true );
trackFocus.Set( n ); // Wrap to the first track trackFocus.Set( n ); // Wrap to the first track
if (n) if (n)
n->EnsureVisible( true ); n->EnsureVisible( true );
@@ -300,9 +286,6 @@ void DoNextTrack(
} }
else else
{ {
// Deselect all other tracks and select this one.
selectionState.SelectNone( tracks );
selectionState.SelectTrack( *n, true, true );
trackFocus.Set( n ); // move focus to next track down trackFocus.Set( n ); // move focus to next track down
n->EnsureVisible( true ); n->EnsureVisible( true );
return; return;