From 93954c8da0996307f277473bf4ac894d97d06395 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Sun, 10 Nov 2019 23:58:07 +0300
Subject: [PATCH] Use BindableList for selected mods

---
 .../Online/TestSceneLeaderboardModSelector.cs | 31 +++++++++++++------
 .../BeatmapSet/LeaderboardModSelector.cs      | 20 +++++-------
 2 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneLeaderboardModSelector.cs b/osu.Game.Tests/Visual/Online/TestSceneLeaderboardModSelector.cs
index 3a64ac79f6..799528220b 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneLeaderboardModSelector.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneLeaderboardModSelector.cs
@@ -13,6 +13,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Bindables;
 using osu.Game.Rulesets;
+using osu.Framework.Extensions.IEnumerableExtensions;
 
 namespace osu.Game.Tests.Visual.Online
 {
@@ -26,10 +27,10 @@ namespace osu.Game.Tests.Visual.Online
         public TestSceneLeaderboardModSelector()
         {
             LeaderboardModSelector modSelector;
-            FillFlowContainer selectedMods;
+            FillFlowContainer<SpriteText> selectedMods;
             Bindable<RulesetInfo> ruleset = new Bindable<RulesetInfo>();
 
-            Add(selectedMods = new FillFlowContainer
+            Add(selectedMods = new FillFlowContainer<SpriteText>
             {
                 Anchor = Anchor.TopLeft,
                 Origin = Anchor.TopLeft,
@@ -42,16 +43,28 @@ namespace osu.Game.Tests.Visual.Online
                 Ruleset = { BindTarget = ruleset }
             });
 
-            modSelector.SelectedMods.BindValueChanged(mods =>
+            modSelector.SelectedMods.ItemsAdded += mods =>
             {
-                selectedMods.Clear();
+                mods.ForEach(mod => selectedMods.Add(new SpriteText
+                {
+                    Text = mod.Acronym,
+                }));
+            };
 
-                foreach (var mod in mods.NewValue)
-                    selectedMods.Add(new SpriteText
+            modSelector.SelectedMods.ItemsRemoved += mods =>
+            {
+                mods.ForEach(mod =>
+                {
+                    foreach (var selected in selectedMods)
                     {
-                        Text = mod.Acronym,
-                    });
-            });
+                        if (selected.Text == mod.Acronym)
+                        {
+                            selectedMods.Remove(selected);
+                            break;
+                        }
+                    }
+                });
+            };
 
             AddStep("osu ruleset", () => ruleset.Value = new OsuRuleset().RulesetInfo);
             AddStep("mania ruleset", () => ruleset.Value = new ManiaRuleset().RulesetInfo);
diff --git a/osu.Game/Overlays/BeatmapSet/LeaderboardModSelector.cs b/osu.Game/Overlays/BeatmapSet/LeaderboardModSelector.cs
index 4b6fd5bfc2..75c24cb710 100644
--- a/osu.Game/Overlays/BeatmapSet/LeaderboardModSelector.cs
+++ b/osu.Game/Overlays/BeatmapSet/LeaderboardModSelector.cs
@@ -5,7 +5,6 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics;
 using osu.Game.Rulesets.Mods;
 using osu.Framework.Bindables;
-using System.Collections.Generic;
 using osu.Game.Rulesets;
 using osuTK;
 using osu.Game.Rulesets.UI;
@@ -21,7 +20,7 @@ namespace osu.Game.Overlays.BeatmapSet
 {
     public class LeaderboardModSelector : CompositeDrawable
     {
-        public readonly Bindable<IEnumerable<Mod>> SelectedMods = new Bindable<IEnumerable<Mod>>();
+        public readonly BindableList<Mod> SelectedMods = new BindableList<Mod>();
         public readonly Bindable<RulesetInfo> Ruleset = new Bindable<RulesetInfo>();
 
         private readonly FillFlowContainer<ModButton> modsContainer;
@@ -47,8 +46,7 @@ namespace osu.Game.Overlays.BeatmapSet
 
         private void onRulesetChanged(ValueChangedEvent<RulesetInfo> ruleset)
         {
-            SelectedMods.Value = new List<Mod>();
-
+            SelectedMods.Clear();
             modsContainer.Clear();
 
             if (ruleset.NewValue == null)
@@ -67,22 +65,18 @@ namespace osu.Game.Overlays.BeatmapSet
 
         private void selectionChanged(Mod mod, bool selected)
         {
-            var mods = SelectedMods.Value.ToList();
-
             if (selected)
-                mods.Add(mod);
+                SelectedMods.Add(mod);
             else
-                mods.Remove(mod);
+                SelectedMods.Remove(mod);
 
-            SelectedMods.Value = mods;
-
-            if (!mods.Any() && !IsHovered)
+            if (!SelectedMods.Any() && !IsHovered)
                 highlightAll();
         }
 
         protected override bool OnHover(HoverEvent e)
         {
-            if (!SelectedMods.Value.Any())
+            if (!SelectedMods.Any())
                 modsContainer.ForEach(button =>
                 {
                     if (!button.IsHovered)
@@ -96,7 +90,7 @@ namespace osu.Game.Overlays.BeatmapSet
         {
             base.OnHoverLost(e);
 
-            if (!SelectedMods.Value.Any())
+            if (!SelectedMods.Any())
                 highlightAll();
         }