From c9325cc41947c5c1b62afe5b3bc249b643f5527b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 7 Sep 2021 14:15:23 +0900
Subject: [PATCH] Fix results screen test scene

---
 .../Visual/Playlists/TestScenePlaylistsResultsScreen.cs       | 1 +
 osu.Game/Screens/Ranking/ScorePanelList.cs                    | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs
index b826683cd5..4bcc887b9f 100644
--- a/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs
+++ b/osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs
@@ -167,6 +167,7 @@ namespace osu.Game.Tests.Visual.Playlists
         private void waitForDisplay()
         {
             AddUntilStep("wait for request to complete", () => requestComplete);
+            AddUntilStep("wait for panels to be visible", () => resultsScreen.ChildrenOfType<ScorePanelList>().FirstOrDefault()?.AllPanelsVisible == true);
             AddWaitStep("wait for display", 5);
         }
 
diff --git a/osu.Game/Screens/Ranking/ScorePanelList.cs b/osu.Game/Screens/Ranking/ScorePanelList.cs
index 6d65137984..a847df344f 100644
--- a/osu.Game/Screens/Ranking/ScorePanelList.cs
+++ b/osu.Game/Screens/Ranking/ScorePanelList.cs
@@ -40,12 +40,12 @@ namespace osu.Game.Screens.Ranking
         /// <summary>
         /// Whether this <see cref="ScorePanelList"/> can be scrolled and is currently scrolled to the start.
         /// </summary>
-        public bool IsScrolledToStart => flow.Count > 0 && scroll.ScrollableExtent > 0 && scroll.Current <= scroll_endpoint_distance;
+        public bool IsScrolledToStart => flow.Count > 0 && AllPanelsVisible && scroll.ScrollableExtent > 0 && scroll.Current <= scroll_endpoint_distance;
 
         /// <summary>
         /// Whether this <see cref="ScorePanelList"/> can be scrolled and is currently scrolled to the end.
         /// </summary>
-        public bool IsScrolledToEnd => flow.Count > 0 && scroll.ScrollableExtent > 0 && scroll.IsScrolledToEnd(scroll_endpoint_distance);
+        public bool IsScrolledToEnd => flow.Count > 0 && AllPanelsVisible && scroll.ScrollableExtent > 0 && scroll.IsScrolledToEnd(scroll_endpoint_distance);
 
         public bool AllPanelsVisible => flow.All(p => p.IsPresent);