From 62a91e4aaab46c458152233ef4208278dc635e4b Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 12 Aug 2019 15:20:21 +0300
Subject: [PATCH] Add the ability to override Highlighted action to the ModIcon

---
 .../Overlays/BeatmapSet/LeaderboardModSelector.cs  | 14 ++++++++++++--
 osu.Game/Rulesets/UI/ModIcon.cs                    | 13 +++++++++++--
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapSet/LeaderboardModSelector.cs b/osu.Game/Overlays/BeatmapSet/LeaderboardModSelector.cs
index 99c1b54467..03d2e6ce4b 100644
--- a/osu.Game/Overlays/BeatmapSet/LeaderboardModSelector.cs
+++ b/osu.Game/Overlays/BeatmapSet/LeaderboardModSelector.cs
@@ -92,11 +92,16 @@ namespace osu.Game.Overlays.BeatmapSet
             {
                 Scale = new Vector2(mod_scale);
                 Add(new HoverClickSounds());
+            }
+
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
 
                 Selected.BindValueChanged(selected =>
                 {
                     updateState();
-                    OnSelectionChanged?.Invoke(mod, selected.NewValue);
+                    OnSelectionChanged?.Invoke(Mod, selected.NewValue);
                 }, true);
             }
 
@@ -120,7 +125,12 @@ namespace osu.Game.Overlays.BeatmapSet
 
             private void updateState()
             {
-                this.FadeColour(IsHovered || Selected.Value ? Color4.White : Color4.Gray, duration, Easing.OutQuint);
+                Highlighted.Value = (IsHovered || Selected.Value) ? true : false;
+            }
+
+            protected override void OnHighlightedChange(ValueChangedEvent<bool> highlighted)
+            {
+                this.FadeColour(highlighted.NewValue ? Color4.White : Color4.Gray, duration, Easing.OutQuint);
             }
         }
 
diff --git a/osu.Game/Rulesets/UI/ModIcon.cs b/osu.Game/Rulesets/UI/ModIcon.cs
index 962263adba..e713216f35 100644
--- a/osu.Game/Rulesets/UI/ModIcon.cs
+++ b/osu.Game/Rulesets/UI/ModIcon.cs
@@ -34,9 +34,11 @@ namespace osu.Game.Rulesets.UI
 
         public virtual string TooltipText { get; }
 
+        protected Mod Mod { get; private set; }
+
         public ModIcon(Mod mod)
         {
-            if (mod == null) throw new ArgumentNullException(nameof(mod));
+            Mod = mod ?? throw new ArgumentNullException(nameof(mod));
 
             type = mod.Type;
 
@@ -106,12 +108,19 @@ namespace osu.Game.Rulesets.UI
                     modIcon.Colour = colours.Yellow;
                     break;
             }
+
+            background.Colour = backgroundColour;
         }
 
         protected override void LoadComplete()
         {
             base.LoadComplete();
-            Highlighted.BindValueChanged(highlighted => background.Colour = highlighted.NewValue ? highlightedColour : backgroundColour, true);
+            Highlighted.BindValueChanged(OnHighlightedChange, true);
+        }
+
+        protected virtual void OnHighlightedChange(ValueChangedEvent<bool> highlighted)
+        {
+            background.Colour = highlighted.NewValue ? highlightedColour : backgroundColour;
         }
     }
 }