From 71dcbeaf7ce57eb0aae0cd72be4f3a74a2e505bd Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sat, 26 Dec 2020 11:43:10 +0900
Subject: [PATCH] Mark user as quit visually on the leaderboard

---
 .../Screens/Play/HUD/GameplayLeaderboardScore.cs    | 13 +++++++++++++
 osu.Game/Screens/Play/HUD/ILeaderboardScore.cs      |  2 ++
 .../Play/HUD/MultiplayerGameplayLeaderboard.cs      | 12 ++++++++++--
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
index 58281debf1..ed86f3241d 100644
--- a/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
+++ b/osu.Game/Screens/Play/HUD/GameplayLeaderboardScore.cs
@@ -34,6 +34,7 @@ namespace osu.Game.Screens.Play.HUD
         public BindableDouble TotalScore { get; } = new BindableDouble();
         public BindableDouble Accuracy { get; } = new BindableDouble(1);
         public BindableInt Combo { get; } = new BindableInt();
+        public BindableBool HasQuit { get; } = new BindableBool();
 
         private int? scorePosition;
 
@@ -230,6 +231,15 @@ namespace osu.Game.Screens.Play.HUD
             TotalScore.BindValueChanged(v => scoreText.Text = v.NewValue.ToString("N0"), true);
             Accuracy.BindValueChanged(v => accuracyText.Text = v.NewValue.FormatAccuracy(), true);
             Combo.BindValueChanged(v => comboText.Text = $"{v.NewValue}x", true);
+            HasQuit.BindValueChanged(v =>
+            {
+                if (v.NewValue)
+                {
+                    // we will probably want to display this in a better way once we have a design.
+                    // and also show states other than quit.
+                    panelColour = Color4.Gray;
+                }
+            }, true);
         }
 
         protected override void LoadComplete()
@@ -244,6 +254,9 @@ namespace osu.Game.Screens.Play.HUD
 
         private void updateColour()
         {
+            if (HasQuit.Value)
+                return;
+
             if (scorePosition == 1)
             {
                 mainFillContainer.ResizeWidthTo(EXTENDED_WIDTH, panel_transition_duration, Easing.OutElastic);
diff --git a/osu.Game/Screens/Play/HUD/ILeaderboardScore.cs b/osu.Game/Screens/Play/HUD/ILeaderboardScore.cs
index bc1a03c5aa..83b6f6621b 100644
--- a/osu.Game/Screens/Play/HUD/ILeaderboardScore.cs
+++ b/osu.Game/Screens/Play/HUD/ILeaderboardScore.cs
@@ -10,5 +10,7 @@ namespace osu.Game.Screens.Play.HUD
         BindableDouble TotalScore { get; }
         BindableDouble Accuracy { get; }
         BindableInt Combo { get; }
+
+        BindableBool HasQuit { get; }
     }
 }
diff --git a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
index a71c4685d9..6b0ca4d74c 100644
--- a/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
+++ b/osu.Game/Screens/Play/HUD/MultiplayerGameplayLeaderboard.cs
@@ -71,6 +71,7 @@ namespace osu.Game.Screens.Play.HUD
                 ((IBindable<double>)leaderboardScore.Accuracy).BindTo(trackedUser.Accuracy);
                 ((IBindable<double>)leaderboardScore.TotalScore).BindTo(trackedUser.Score);
                 ((IBindable<int>)leaderboardScore.Combo).BindTo(trackedUser.CurrentCombo);
+                ((IBindable<bool>)leaderboardScore.HasQuit).BindTo(trackedUser.UserQuit);
             }
 
             scoringMode = config.GetBindable<ScoringMode>(OsuSetting.ScoreDisplayMode);
@@ -81,8 +82,15 @@ namespace osu.Game.Screens.Play.HUD
         {
             base.LoadComplete();
 
-            playingUsers.BindCollectionChanged(usersChanged);
+            // BindableList handles binding in a really bad way (Clear then AddRange) so we need to do this manually..
+            foreach (int userId in playingUsers)
+            {
+                if (!multiplayerClient.PlayingUsers.Contains(userId))
+                    usersChanged(this, new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Remove, new[] { userId }));
+            }
+
             playingUsers.BindTo(multiplayerClient.PlayingUsers);
+            playingUsers.BindCollectionChanged(usersChanged);
         }
 
         private void usersChanged(object sender, NotifyCollectionChangedEventArgs e)
@@ -157,7 +165,7 @@ namespace osu.Game.Screens.Play.HUD
 
             public void UpdateScore(ScoreProcessor processor, ScoringMode mode)
             {
-                Debug.Assert(UserQuit.Value);
+                Debug.Assert(!UserQuit.Value);
 
                 if (LastHeader == null)
                     return;