Factor in total score calculation time in results screen load

osu.Game/Screens/OnlinePlay/Playlists/PlaylistsResultsScreen.cs

@@ -32,6 +32,9 @@ public class PlaylistsResultsScreen : ResultsScreen
         [Resolved]
         private IAPIProvider api { get; set; }
 
+        [Resolved]
+        private ScoreManager scoreManager { get; set; }
+
         public PlaylistsResultsScreen(ScoreInfo score, long roomId, PlaylistItem playlistItem, bool allowRetry, bool allowWatchingReplay = true)
             : base(score, allowRetry, allowWatchingReplay)
         {
@@ -166,23 +169,28 @@ private APIRequest createIndexRequest(Action<IEnumerable<ScoreInfo>> scoresCallb
         /// <param name="pivot">An optional pivot around which the scores were retrieved.</param>
         private void performSuccessCallback([NotNull] Action<IEnumerable<ScoreInfo>> callback, [NotNull] List<MultiplayerScore> scores, [CanBeNull] MultiplayerScores pivot = null)
         {
-            var scoreInfos = new List<ScoreInfo>(scores.Select(s => s.CreateScoreInfo(playlistItem)));
+            var scoreInfos = scores.Select(s => s.CreateScoreInfo(playlistItem)).ToArray();
 
-            // Select a score if we don't already have one selected.
+            // Score panels calculate total score before displaying, which can take some time. In order to count that calculation as part of the loading spinner display duration,
-            // Note: This is done before the callback so that the panel list centres on the selected score before panels are added (eliminating initial scroll).
+            // calculate the total scores locally before invoking the success callback.
-            if (SelectedScore.Value == null)
+            scoreManager.OrderByTotalScoreAsync(scoreInfos).ContinueWith(_ => Schedule(() =>
             {
-                Schedule(() =>
+                // Select a score if we don't already have one selected.
+                // Note: This is done before the callback so that the panel list centres on the selected score before panels are added (eliminating initial scroll).
+                if (SelectedScore.Value == null)
                 {
-                    // Prefer selecting the local user's score, or otherwise default to the first visible score.
+                    Schedule(() =>
-                    SelectedScore.Value = scoreInfos.FirstOrDefault(s => s.User.Id == api.LocalUser.Value.Id) ?? scoreInfos.FirstOrDefault();
+                    {
-                });
+                        // Prefer selecting the local user's score, or otherwise default to the first visible score.
-            }
+                        SelectedScore.Value = scoreInfos.FirstOrDefault(s => s.User.Id == api.LocalUser.Value.Id) ?? scoreInfos.FirstOrDefault();
+                    });
+                }
 
-            // Invoke callback to add the scores. Exclude the user's current score which was added previously.
+                // Invoke callback to add the scores. Exclude the user's current score which was added previously.
-            callback.Invoke(scoreInfos.Where(s => s.OnlineScoreID != Score?.OnlineScoreID));
+                callback.Invoke(scoreInfos.Where(s => s.OnlineScoreID != Score?.OnlineScoreID));
 
-            hideLoadingSpinners(pivot);
+                hideLoadingSpinners(pivot);
+            }));
         }
 
         private void hideLoadingSpinners([CanBeNull] MultiplayerScores pivot = null)

osu.Game/Screens/Ranking/ResultsScreen.cs

@@ -52,8 +52,7 @@ public abstract class ResultsScreen : ScreenWithBeatmapBackground, IKeyBindingHa
         private Drawable bottomPanel;
         private Container<ScorePanel> detachedPanelContainer;
 
-        private bool fetchedInitialScores;
+        private bool lastFetchCompleted;
-        private APIRequest nextPageRequest;
 
         private readonly bool allowRetry;
         private readonly bool allowWatchingReplay;
@@ -191,8 +190,10 @@ protected override void Update()
         {
             base.Update();
 
-            if (fetchedInitialScores && nextPageRequest == null)
+            if (lastFetchCompleted)
             {
+                APIRequest nextPageRequest = null;
+
                 if (ScorePanelList.IsScrolledToStart)
                     nextPageRequest = FetchNextPage(-1, fetchScoresCallback);
                 else if (ScorePanelList.IsScrolledToEnd)
@@ -200,10 +201,7 @@ protected override void Update()
 
                 if (nextPageRequest != null)
                 {
-                    // Scheduled after children to give the list a chance to update its scroll position and not potentially trigger a second request too early.
+                    lastFetchCompleted = false;
-                    nextPageRequest.Success += () => ScheduleAfterChildren(() => nextPageRequest = null);
-                    nextPageRequest.Failure += _ => ScheduleAfterChildren(() => nextPageRequest = null);
-
                     api.Queue(nextPageRequest);
                 }
             }
@@ -229,7 +227,7 @@ private void fetchScoresCallback(IEnumerable<ScoreInfo> scores) => Schedule(() =
             foreach (var s in scores)
                 addScore(s);
 
-            fetchedInitialScores = true;
+            lastFetchCompleted = true;
         });
 
         public override void OnEntering(IScreen last)