From 8f9b8ed5a19d121977a08c16b308dc734ef2d3a8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 11 Jul 2019 11:17:33 +0900
Subject: [PATCH] Simplify information propagation logic

---
 .../Overlays/BeatmapSet/Scores/ScoreTable.cs  |  2 +-
 .../BeatmapSet/Scores/ScoresContainer.cs      | 60 +++++++++----------
 2 files changed, 29 insertions(+), 33 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
index 15816be327..347522fb48 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/ScoreTable.cs
@@ -59,7 +59,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
                 Content = null;
                 backgroundFlow.Clear();
 
-                if (value == null || !value.Any())
+                if (value?.Any() != true)
                     return;
 
                 for (int i = 0; i < value.Count; i++)
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs b/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
index 5f200d7343..22d7ea9c97 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
@@ -8,7 +8,6 @@ using osu.Framework.Graphics.Shapes;
 using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
 using osuTK;
-using System.Collections.Generic;
 using System.Linq;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Beatmaps;
@@ -48,16 +47,34 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
             }
         }
 
-        private APILegacyScores scores;
-
         protected APILegacyScores Scores
         {
-            get => scores;
             set
             {
-                scores = value;
+                Schedule(() =>
+                {
+                    loading = false;
 
-                updateDisplay();
+                    topScoresContainer.Clear();
+
+                    if (value?.Scores.Any() != true)
+                    {
+                        scoreTable.Scores = null;
+                        scoreTable.Hide();
+                        return;
+                    }
+
+                    scoreTable.Scores = value.Scores;
+                    scoreTable.Show();
+
+                    var topScore = value.Scores.First();
+                    var userScore = value.UserScore;
+
+                    topScoresContainer.Add(new DrawableTopScore(topScore));
+
+                    if (userScore != null && userScore.Score.OnlineScoreID != topScore.OnlineScoreID)
+                        topScoresContainer.Add(new DrawableTopScore(userScore.Score, userScore.Position));
+                });
             }
         }
 
@@ -109,7 +126,6 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
         private void load(OsuColour colours)
         {
             background.Colour = colours.Gray2;
-            updateDisplay();
         }
 
         private bool loading
@@ -125,35 +141,15 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
             Scores = null;
 
             if (beatmap?.OnlineBeatmapID.HasValue != true)
+            {
+                loading = false;
                 return;
-
-            loading = true;
+            }
 
             getScoresRequest = new GetScoresRequest(beatmap, beatmap.Ruleset);
-            getScoresRequest.Success += scores => Schedule(() =>
-            {
-                Scores = scores;
-                loading = false;
-            });
+            getScoresRequest.Success += scores => Scores = scores;
             api.Queue(getScoresRequest);
-        }
-
-        private void updateDisplay()
-        {
-            topScoresContainer.Clear();
-
-            scoreTable.Scores = scores?.Scores.Count > 1 ? scores.Scores : new List<APILegacyScoreInfo>();
-            scoreTable.FadeTo(scores?.Scores.Count > 1 ? 1 : 0);
-
-            if (scores?.Scores.Any() ?? false)
-            {
-                topScoresContainer.Add(new DrawableTopScore(scores.Scores.FirstOrDefault()));
-
-                var userScore = scores.UserScore;
-
-                if (userScore != null && userScore.Position != 1)
-                    topScoresContainer.Add(new DrawableTopScore(userScore.Score, userScore.Position));
-            }
+            loading = true;
         }
     }
 }