From 7920e93fa91dbe14a610591cb4446a3c08d63819 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 16 Jan 2024 17:36:46 +0300
Subject: [PATCH 1/2] Rework GlowingSpriteText

---
 .../Graphics/Sprites/GlowingSpriteText.cs     | 85 +++++++++----------
 1 file changed, 40 insertions(+), 45 deletions(-)

diff --git a/osu.Game/Graphics/Sprites/GlowingSpriteText.cs b/osu.Game/Graphics/Sprites/GlowingSpriteText.cs
index 1355bfc272..669c5da01e 100644
--- a/osu.Game/Graphics/Sprites/GlowingSpriteText.cs
+++ b/osu.Game/Graphics/Sprites/GlowingSpriteText.cs
@@ -5,95 +5,90 @@ using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Primitives;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
+using osu.Framework.Utils;
 using osuTK;
 
 namespace osu.Game.Graphics.Sprites
 {
-    public partial class GlowingSpriteText : Container, IHasText
+    public partial class GlowingSpriteText : BufferedContainer, IHasText
     {
-        private readonly OsuSpriteText spriteText, blurredText;
+        private const float blur_sigma = 3f;
+
+        // Inflate draw quad to prevent glow from trimming at the edges.
+        // Padding won't suffice since it will affect text position in cases when it's not centered.
+        protected override Quad ComputeScreenSpaceDrawQuad() => base.ComputeScreenSpaceDrawQuad().AABBFloat.Inflate(Blur.KernelSize(blur_sigma));
+
+        private readonly OsuSpriteText text;
 
         public LocalisableString Text
         {
-            get => spriteText.Text;
-            set => blurredText.Text = spriteText.Text = value;
+            get => text.Text;
+            set => text.Text = value;
         }
 
         public FontUsage Font
         {
-            get => spriteText.Font;
-            set => blurredText.Font = spriteText.Font = value.With(fixedWidth: true);
+            get => text.Font;
+            set => text.Font = value.With(fixedWidth: true);
         }
 
         public Vector2 TextSize
         {
-            get => spriteText.Size;
-            set => blurredText.Size = spriteText.Size = value;
+            get => text.Size;
+            set => text.Size = value;
         }
 
         public ColourInfo TextColour
         {
-            get => spriteText.Colour;
-            set => spriteText.Colour = value;
+            get => text.Colour;
+            set => text.Colour = value;
         }
 
         public ColourInfo GlowColour
         {
-            get => blurredText.Colour;
-            set => blurredText.Colour = value;
+            get => EffectColour;
+            set
+            {
+                EffectColour = value;
+                BackgroundColour = value.MultiplyAlpha(0f);
+            }
         }
 
         public Vector2 Spacing
         {
-            get => spriteText.Spacing;
-            set => spriteText.Spacing = blurredText.Spacing = value;
+            get => text.Spacing;
+            set => text.Spacing = value;
         }
 
         public bool UseFullGlyphHeight
         {
-            get => spriteText.UseFullGlyphHeight;
-            set => spriteText.UseFullGlyphHeight = blurredText.UseFullGlyphHeight = value;
+            get => text.UseFullGlyphHeight;
+            set => text.UseFullGlyphHeight = value;
         }
 
         public Bindable<string> Current
         {
-            get => spriteText.Current;
-            set => spriteText.Current = value;
+            get => text.Current;
+            set => text.Current = value;
         }
 
         public GlowingSpriteText()
+            : base(cachedFrameBuffer: true)
         {
             AutoSizeAxes = Axes.Both;
-
-            Children = new Drawable[]
+            BlurSigma = new Vector2(blur_sigma);
+            RedrawOnScale = false;
+            DrawOriginal = true;
+            EffectBlending = BlendingParameters.Additive;
+            EffectPlacement = EffectPlacement.InFront;
+            Child = text = new OsuSpriteText
             {
-                new BufferedContainer(cachedFrameBuffer: true)
-                {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    BlurSigma = new Vector2(4),
-                    RedrawOnScale = false,
-                    RelativeSizeAxes = Axes.Both,
-                    Blending = BlendingParameters.Additive,
-                    Size = new Vector2(3f),
-                    Children = new[]
-                    {
-                        blurredText = new OsuSpriteText
-                        {
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
-                            Shadow = false,
-                        },
-                    },
-                },
-                spriteText = new OsuSpriteText
-                {
-                    Anchor = Anchor.Centre,
-                    Origin = Anchor.Centre,
-                    Shadow = false,
-                },
+                Anchor = Anchor.Centre,
+                Origin = Anchor.Centre,
+                Shadow = false,
             };
         }
     }

From dfdf700560726d0f8bd87408b3cecd9b0e373f4c Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 16 Jan 2024 17:39:37 +0300
Subject: [PATCH 2/2] Don't use glowing text in ScoreComponentLabel

---
 osu.Game/Online/Leaderboards/LeaderboardScore.cs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Online/Leaderboards/LeaderboardScore.cs b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
index 1c2a26eafb..964f065813 100644
--- a/osu.Game/Online/Leaderboards/LeaderboardScore.cs
+++ b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
@@ -358,14 +358,12 @@ namespace osu.Game.Online.Leaderboards
                                 },
                             },
                         },
-                        new GlowingSpriteText
+                        new OsuSpriteText
                         {
                             Anchor = Anchor.CentreLeft,
                             Origin = Anchor.CentreLeft,
-                            TextColour = Color4.White,
-                            GlowColour = Color4Extensions.FromHex(@"83ccfa"),
                             Text = statistic.Value,
-                            Font = OsuFont.GetFont(size: 17, weight: FontWeight.Bold),
+                            Font = OsuFont.GetFont(size: 17, weight: FontWeight.Bold, fixedWidth: true)
                         },
                     },
                 };