Simplify OverlayRulesetTabItem.AccentColour

osu.Game/Overlays/OverlayRulesetSelector.cs

@@ -1,44 +1,21 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.UserInterface;
-using osu.Game.Graphics;
 using osu.Game.Rulesets;
 using osuTK;
-using osuTK.Graphics;
-using System.Linq;
 
 namespace osu.Game.Overlays
 {
     public class OverlayRulesetSelector : RulesetSelector
     {
-        private Color4 accentColour;
-
-        public Color4 AccentColour
-        {
-            get => accentColour;
-            set
-            {
-                accentColour = value;
-                foreach (var i in TabContainer.Children.OfType<IHasAccentColour>())
-                    i.AccentColour = value;
-            }
-        }
-
         public OverlayRulesetSelector()
         {
             AutoSizeAxes = Axes.Both;
         }
 
-        [BackgroundDependencyLoader]
-        private void load(OverlayColourProvider colourProvider)
-        {
-            AccentColour = colourProvider.Highlight1;
-        }
-
         protected override TabItem<RulesetInfo> CreateTabItem(RulesetInfo value) => new OverlayRulesetTabItem(value);
 
         protected override TabFillFlowContainer CreateTabFlow() => new TabFillFlowContainer

osu.Game/Overlays/OverlayRulesetTabItem.cs

@@ -11,27 +11,31 @@ using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets;
 using osuTK.Graphics;
 using osuTK;
-using osu.Framework.Bindables;
+using osu.Framework.Allocation;
 
 namespace osu.Game.Overlays
 {
-    public class OverlayRulesetTabItem : TabItem<RulesetInfo>, IHasAccentColour
+    public class OverlayRulesetTabItem : TabItem<RulesetInfo>
     {
         protected readonly OsuSpriteText Text;
         private readonly FillFlowContainer content;
 
-        public override bool PropagatePositionalInputSubTree => Enabled.Value && !Active.Value && base.PropagatePositionalInputSubTree;
+        protected override Container<Drawable> Content => content;
 
-        private readonly Bindable<Color4> accentColour = new Bindable<Color4>();
+        private Color4 accentColour;
-        private readonly Bindable<Color4> currentColour = new Bindable<Color4>();
 
-        public Color4 AccentColour
+        protected virtual Color4 AccentColour
         {
-            get => accentColour.Value;
+            get => accentColour;
-            set => accentColour.Value = value;
+            set
+            {
+                accentColour = value;
+                Text.FadeColour(value, 120, Easing.OutQuint);
+            }
         }
 
-        protected override Container<Drawable> Content => content;
+        [Resolved]
+        private OverlayColourProvider colourProvider { get; set; }
 
         public OverlayRulesetTabItem(RulesetInfo value)
             : base(value)
@@ -58,13 +62,10 @@ namespace osu.Game.Overlays
             Enabled.Value = true;
         }
 
-        protected override void LoadComplete()
+        [BackgroundDependencyLoader]
+        private void load()
         {
-            base.LoadComplete();
+            updateState();
-
-            currentColour.BindValueChanged(OnCurrentColourChanged);
-            accentColour.BindValueChanged(_ => updateState());
-            Enabled.BindValueChanged(_ => updateState(), true);
         }
 
         protected override bool OnHover(HoverEvent e)
@@ -87,14 +88,7 @@ namespace osu.Game.Overlays
         private void updateState()
         {
             Text.Font = Text.Font.With(weight: Active.Value ? FontWeight.Bold : FontWeight.Medium);
-
+            AccentColour = IsHovered || Active.Value ? Color4.White : colourProvider.Highlight1;
-            currentColour.Value = IsHovered || Active.Value
-                ? Color4.White
-                : Enabled.Value
-                    ? AccentColour
-                    : Color4.DimGray;
         }
-
-        protected virtual void OnCurrentColourChanged(ValueChangedEvent<Color4> colour) => Text.FadeColour(colour.NewValue, 120, Easing.OutQuint);
     }
 }

osu.Game/Overlays/Profile/Header/Components/ProfileRulesetTabItem.cs

@@ -1,7 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Sprites;
 using osu.Game.Rulesets;
@@ -28,6 +27,16 @@ namespace osu.Game.Overlays.Profile.Header.Components
             }
         }
 
+        protected override Color4 AccentColour
+        {
+            get => base.AccentColour;
+            set
+            {
+                base.AccentColour = value;
+                icon.FadeColour(value, 120, Easing.OutQuint);
+            }
+        }
+
         private readonly SpriteIcon icon;
 
         public ProfileRulesetTabItem(RulesetInfo value)
@@ -43,11 +52,5 @@ namespace osu.Game.Overlays.Profile.Header.Components
                 Size = new Vector2(12),
             });
         }
-
-        protected override void OnCurrentColourChanged(ValueChangedEvent<Color4> colour)
-        {
-            base.OnCurrentColourChanged(colour);
-            icon.FadeColour(colour.NewValue, 120, Easing.OutQuint);
-        }
     }
 }