From 9c36cb4af4f60a8675640471a99adf65968ea7dd Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 12 Aug 2019 14:33:30 +0300
Subject: [PATCH] Use existing AccentColour logic instead of weird BoxColour

---
 .../Graphics/UserInterface/PageTabControl.cs  | 26 ++++++++++++-------
 .../BeatmapSet/LeaderboardScopeSelector.cs    | 14 +++++-----
 2 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/PageTabControl.cs b/osu.Game/Graphics/UserInterface/PageTabControl.cs
index f8d1c7502a..a0d3745180 100644
--- a/osu.Game/Graphics/UserInterface/PageTabControl.cs
+++ b/osu.Game/Graphics/UserInterface/PageTabControl.cs
@@ -24,7 +24,13 @@ namespace osu.Game.Graphics.UserInterface
             Height = 30;
         }
 
-        public class PageTabItem : TabItem<T>
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            AccentColour = colours.Yellow;
+        }
+
+        public class PageTabItem : TabItem<T>, IHasAccentColour
         {
             private const float transition_duration = 100;
 
@@ -32,10 +38,16 @@ namespace osu.Game.Graphics.UserInterface
 
             protected readonly SpriteText Text;
 
-            protected Color4 BoxColour
+            private Color4 accentColour;
+
+            public Color4 AccentColour
             {
-                get => box.Colour;
-                set => box.Colour = value;
+                get => accentColour;
+                set
+                {
+                    accentColour = value;
+                    box.Colour = accentColour;
+                }
             }
 
             public PageTabItem(T value)
@@ -69,12 +81,6 @@ namespace osu.Game.Graphics.UserInterface
                 Active.BindValueChanged(active => Text.Font = Text.Font.With(Typeface.Exo, weight: active.NewValue ? FontWeight.Bold : FontWeight.Medium), true);
             }
 
-            [BackgroundDependencyLoader]
-            private void load(OsuColour colours)
-            {
-                BoxColour = colours.Yellow;
-            }
-
             protected override bool OnHover(HoverEvent e)
             {
                 if (!Active.Value)
diff --git a/osu.Game/Overlays/BeatmapSet/LeaderboardScopeSelector.cs b/osu.Game/Overlays/BeatmapSet/LeaderboardScopeSelector.cs
index f54509ff77..c867cc3780 100644
--- a/osu.Game/Overlays/BeatmapSet/LeaderboardScopeSelector.cs
+++ b/osu.Game/Overlays/BeatmapSet/LeaderboardScopeSelector.cs
@@ -39,6 +39,12 @@ namespace osu.Game.Overlays.BeatmapSet
             });
         }
 
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            AccentColour = colours.Blue;
+        }
+
         protected override TabFillFlowContainer CreateTabFlow() => new TabFillFlowContainer
         {
             Anchor = Anchor.BottomCentre,
@@ -57,15 +63,9 @@ namespace osu.Game.Overlays.BeatmapSet
                 Text.Font = OsuFont.GetFont(size: 16);
             }
 
-            [BackgroundDependencyLoader]
-            private void load(OsuColour colours)
-            {
-                BoxColour = colours.Blue;
-            }
-
             protected override bool OnHover(HoverEvent e)
             {
-                Text.FadeColour(BoxColour);
+                Text.FadeColour(AccentColour);
 
                 return base.OnHover(e);
             }