From 904b068a15c5bb55629d70c8bb5ca035a1d65649 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Thu, 2 Jan 2020 13:18:18 +0300
Subject: [PATCH] Simplify colour setting for additional elements in
 OverlayRulesetTabItem

---
 osu.Game/Overlays/OverlayRulesetTabItem.cs    | 23 +++++++++++--------
 .../Components/ProfileRulesetTabItem.cs       | 13 +----------
 2 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/osu.Game/Overlays/OverlayRulesetTabItem.cs b/osu.Game/Overlays/OverlayRulesetTabItem.cs
index 9d6d28a81f..e1cc1de8de 100644
--- a/osu.Game/Overlays/OverlayRulesetTabItem.cs
+++ b/osu.Game/Overlays/OverlayRulesetTabItem.cs
@@ -11,6 +11,7 @@ using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets;
 using osuTK.Graphics;
 using osuTK;
+using System;
 
 namespace osu.Game.Overlays
 {
@@ -33,10 +34,12 @@ namespace osu.Game.Overlays
 
                 accentColour = value;
 
-                UpdateState();
+                updateState();
             }
         }
 
+        protected Action<Color4> OnStateUpdated;
+
         protected override Container<Drawable> Content => content;
 
         public OverlayRulesetTabItem(RulesetInfo value)
@@ -67,32 +70,32 @@ namespace osu.Game.Overlays
         protected override void LoadComplete()
         {
             base.LoadComplete();
-            Enabled.BindValueChanged(_ => UpdateState(), true);
+            Enabled.BindValueChanged(_ => updateState(), true);
         }
 
         protected override bool OnHover(HoverEvent e)
         {
             base.OnHover(e);
-            UpdateState();
+            updateState();
             return true;
         }
 
         protected override void OnHoverLost(HoverLostEvent e)
         {
             base.OnHoverLost(e);
-            UpdateState();
+            updateState();
         }
 
-        protected override void OnActivated() => UpdateState();
+        protected override void OnActivated() => updateState();
 
-        protected override void OnDeactivated() => UpdateState();
+        protected override void OnDeactivated() => updateState();
 
-        protected virtual void UpdateState()
+        private void updateState()
         {
+            var updatedColour = IsHovered || Active.Value ? Color4.White : Enabled.Value ? AccentColour : Color4.DimGray;
             Text.Font = Text.Font.With(weight: Active.Value ? FontWeight.Bold : FontWeight.Medium);
-            Text.FadeColour(GetColour(), 120, Easing.OutQuint);
+            Text.FadeColour(updatedColour, 120, Easing.OutQuint);
+            OnStateUpdated?.Invoke(updatedColour);
         }
-
-        protected Color4 GetColour() => IsHovered || Active.Value ? Color4.White : Enabled.Value ? AccentColour : Color4.DimGray;
     }
 }
diff --git a/osu.Game/Overlays/Profile/Header/Components/ProfileRulesetTabItem.cs b/osu.Game/Overlays/Profile/Header/Components/ProfileRulesetTabItem.cs
index adf324b259..d416e98b31 100644
--- a/osu.Game/Overlays/Profile/Header/Components/ProfileRulesetTabItem.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/ProfileRulesetTabItem.cs
@@ -5,7 +5,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Rulesets;
 using osuTK;
-using osuTK.Graphics;
 
 namespace osu.Game.Overlays.Profile.Header.Components
 {
@@ -13,12 +12,6 @@ namespace osu.Game.Overlays.Profile.Header.Components
     {
         private readonly SpriteIcon icon;
 
-        public new Color4 AccentColour
-        {
-            get => base.AccentColour;
-            set => base.AccentColour = icon.Colour = value;
-        }
-
         private bool isDefault;
 
         public bool IsDefault
@@ -47,12 +40,8 @@ namespace osu.Game.Overlays.Profile.Header.Components
                 Icon = FontAwesome.Solid.Star,
                 Size = new Vector2(12),
             });
-        }
 
-        protected override void UpdateState()
-        {
-            base.UpdateState();
-            icon.FadeColour(GetColour(), 120, Easing.OutQuint);
+            OnStateUpdated += colour => icon.FadeColour(colour, 120, Easing.OutQuint);
         }
     }
 }