Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-11-21 16:37:12 +01:00
Code Issues Releases Wiki Activity

Remove TrackPanel::EnsureVisible; TrackList sends an event instead

Browse Source
This commit is contained in:
Paul Licameli
2019-06-10 11:20:07 -04:00
parent d236507682
commit 2257fa642a
12 changed files with 116 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
src/menus/NavigationMenus.cpp
View File

@@ -96,8 +96,8 @@ void DoPrevTrack(
{
t = *tracks.Any().rbegin();
trackPanel.SetFocusedTrack( t );
trackPanel.EnsureVisible( t );
projectHistory.ModifyState(false);
if (t)
t->EnsureVisible( true );
return;
}
@@ -116,7 +116,7 @@ void DoPrevTrack(
p = *tracks.Any().rbegin();
else
{
trackPanel.EnsureVisible( t );
t->EnsureVisible();
return;
}
}
@@ -128,8 +128,8 @@ void DoPrevTrack(
selectionState.SelectTrack
( *t, false, false );
trackPanel.SetFocusedTrack( p ); // move focus to next track up
trackPanel.EnsureVisible( p );
projectHistory.ModifyState(false);
if (p)
p->EnsureVisible( true );
return;
}
if( tSelected && !pSelected )
@@ -137,8 +137,8 @@ void DoPrevTrack(
selectionState.SelectTrack
( *p, true, false );
trackPanel.SetFocusedTrack( p ); // move focus to next track up
trackPanel.EnsureVisible( p );
projectHistory.ModifyState(false);
if (p)
p->EnsureVisible( true );
return;
}
if( !tSelected && pSelected )
@@ -146,8 +146,8 @@ void DoPrevTrack(
selectionState.SelectTrack
( *p, false, false );
trackPanel.SetFocusedTrack( p ); // move focus to next track up
trackPanel.EnsureVisible( p );
projectHistory.ModifyState(false);
if (p)
p->EnsureVisible( true );
return;
}
if( !tSelected && !pSelected )
@@ -155,8 +155,8 @@ void DoPrevTrack(
selectionState.SelectTrack
( *t, true, false );
trackPanel.SetFocusedTrack( p ); // move focus to next track up
trackPanel.EnsureVisible( p );
projectHistory.ModifyState(false);
if (p)
p->EnsureVisible( true );
return;
}
}
@@ -171,21 +171,20 @@ void DoPrevTrack(
auto range = tracks.Leaders();
p = * range.rbegin(); // null if range is empty
trackPanel.SetFocusedTrack( p ); // Wrap to the last track
trackPanel.EnsureVisible( p );
projectHistory.ModifyState(false);
if (p)
p->EnsureVisible( true );
return;
}
else
{
trackPanel.EnsureVisible( t );
t->EnsureVisible();
return;
}
}
else
{
trackPanel.SetFocusedTrack( p ); // move focus to next track up
trackPanel.EnsureVisible( p );
projectHistory.ModifyState(false);
p->EnsureVisible( true );
return;
}
}
@@ -207,8 +206,8 @@ void DoNextTrack(
{
t = *tracks.Any().begin();
trackPanel.SetFocusedTrack( t );
trackPanel.EnsureVisible( t );
projectHistory.ModifyState(false);
if (t)
t->EnsureVisible( true );
return;
}
@@ -222,7 +221,7 @@ void DoNextTrack(
n = *tracks.Any().begin();
else
{
trackPanel.EnsureVisible( t );
t->EnsureVisible();
return;
}
}
@@ -233,8 +232,8 @@ void DoNextTrack(
selectionState.SelectTrack
( *t, false, false );
trackPanel.SetFocusedTrack( n ); // move focus to next track down
trackPanel.EnsureVisible( n );
projectHistory.ModifyState(false);
if (n)
n->EnsureVisible( true );
return;
}
if( tSelected && !nSelected )
@@ -242,8 +241,8 @@ void DoNextTrack(
selectionState.SelectTrack
( *n, true, false );
trackPanel.SetFocusedTrack( n ); // move focus to next track down
trackPanel.EnsureVisible( n );
projectHistory.ModifyState(false);
if (n)
n->EnsureVisible( true );
return;
}
if( !tSelected && nSelected )
@@ -251,8 +250,8 @@ void DoNextTrack(
selectionState.SelectTrack
( *n, false, false );
trackPanel.SetFocusedTrack( n ); // move focus to next track down
trackPanel.EnsureVisible( n );
projectHistory.ModifyState(false);
if (n)
n->EnsureVisible( true );
return;
}
if( !tSelected && !nSelected )
@@ -260,8 +259,8 @@ void DoNextTrack(
selectionState.SelectTrack
( *t, true, false );
trackPanel.SetFocusedTrack( n ); // move focus to next track down
trackPanel.EnsureVisible( n );
projectHistory.ModifyState(false);
if (n)
n->EnsureVisible( true );
return;
}
}
@@ -275,21 +274,20 @@ void DoNextTrack(
{
n = *tracks.Any().begin();
trackPanel.SetFocusedTrack( n ); // Wrap to the first track
trackPanel.EnsureVisible( n );
projectHistory.ModifyState(false);
if (n)
n->EnsureVisible( true );
return;
}
else
{
trackPanel.EnsureVisible( t );
t->EnsureVisible();
return;
}
}
else
{
trackPanel.SetFocusedTrack( n ); // move focus to next track down
trackPanel.EnsureVisible( n );
projectHistory.ModifyState(false);
n->EnsureVisible( true );
return;
}
}
@@ -472,11 +470,9 @@ void OnFirstTrack(const CommandContext &context)
auto f = *tracks.Any().begin();
if (t != f)
{
trackPanel.SetFocusedTrack(f);
ProjectHistory::Get( project ).ModifyState(false);
}
trackPanel.EnsureVisible(f);
if (f)
f->EnsureVisible( t != f );
}
void OnLastTrack(const CommandContext &context)
@@ -491,11 +487,9 @@ void OnLastTrack(const CommandContext &context)
auto l = *tracks.Any().rbegin();
if (t != l)
{
trackPanel.SetFocusedTrack(l);
ProjectHistory::Get( project ).ModifyState(false);
}
trackPanel.EnsureVisible(l);
if (l)
l->EnsureVisible( t != l );
}
void OnShiftUp(const CommandContext &context)
@@ -524,8 +518,7 @@ void OnToggle(const CommandContext &context)
selectionState.SelectTrack
( *t, !t->GetSelected(), true );
trackPanel.EnsureVisible( t );
ProjectHistory::Get( project ).ModifyState(false);
t->EnsureVisible( true );
trackPanel.GetAx().Updated();