From 3829d278451c71aa4223c70520331f970ad79cb7 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Fri, 29 Apr 2022 12:19:22 +0300
Subject: [PATCH] Update overlay ruleset selector design

---
 osu.Game/Overlays/OverlayRulesetTabItem.cs | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Overlays/OverlayRulesetTabItem.cs b/osu.Game/Overlays/OverlayRulesetTabItem.cs
index 9d4afc94d1..4f58d4c189 100644
--- a/osu.Game/Overlays/OverlayRulesetTabItem.cs
+++ b/osu.Game/Overlays/OverlayRulesetTabItem.cs
@@ -5,14 +5,12 @@
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input.Events;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets;
 using osuTK.Graphics;
 using osuTK;
 using osu.Framework.Allocation;
-using osu.Framework.Extensions.Color4Extensions;
+using osu.Game.Graphics.Containers;
 
 namespace osu.Game.Overlays
 {
@@ -26,7 +24,7 @@ protected virtual Color4 AccentColour
             set
             {
                 accentColour = value;
-                text.FadeColour(value, 120, Easing.OutQuint);
+                icon.FadeColour(value, 120, Easing.OutQuint);
             }
         }
 
@@ -35,7 +33,7 @@ protected virtual Color4 AccentColour
         [Resolved]
         private OverlayColourProvider colourProvider { get; set; }
 
-        private readonly OsuSpriteText text;
+        private readonly Drawable icon;
 
         public OverlayRulesetTabItem(RulesetInfo value)
             : base(value)
@@ -48,15 +46,14 @@ public OverlayRulesetTabItem(RulesetInfo value)
                 {
                     AutoSizeAxes = Axes.Both,
                     Direction = FillDirection.Horizontal,
-                    Spacing = new Vector2(3, 0),
-                    Child = text = new OsuSpriteText
+                    Spacing = new Vector2(5f, 0),
+                    Child = icon = new ConstrainedIconContainer
                     {
-                        Origin = Anchor.Centre,
                         Anchor = Anchor.Centre,
-                        Text = value.Name,
-                        Font = OsuFont.GetFont(size: 14),
-                        ShadowColour = Color4.Black.Opacity(0.75f)
-                    }
+                        Origin = Anchor.Centre,
+                        Size = new Vector2(20f),
+                        Icon = value.CreateInstance().CreateIcon(),
+                    },
                 },
                 new HoverClickSounds()
             });
@@ -91,7 +88,6 @@ protected override void OnHoverLost(HoverLostEvent e)
 
         private void updateState()
         {
-            text.Font = text.Font.With(weight: Active.Value ? FontWeight.Bold : FontWeight.Medium);
             AccentColour = Enabled.Value ? getActiveColour() : colourProvider.Foreground1;
         }