From 794b4c46cf9c93ddf9c1294a722f3e4114d11e0d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 10 Oct 2021 17:56:32 +0900
Subject: [PATCH] Split score counter class into two distinct classes to
 simplify usages

---
 .../Components/TournamentMatchScoreDisplay.cs |  3 +--
 .../CommaSeparatedScoreCounter.cs             | 24 +++++++++++++++++++
 .../Graphics/UserInterface/ScoreCounter.cs    | 20 ++++------------
 .../Screens/Play/HUD/MatchScoreDisplay.cs     |  3 +--
 4 files changed, 30 insertions(+), 20 deletions(-)
 create mode 100644 osu.Game/Graphics/UserInterface/CommaSeparatedScoreCounter.cs

diff --git a/osu.Game.Tournament/Screens/Gameplay/Components/TournamentMatchScoreDisplay.cs b/osu.Game.Tournament/Screens/Gameplay/Components/TournamentMatchScoreDisplay.cs
index 3624c08187..77101e4023 100644
--- a/osu.Game.Tournament/Screens/Gameplay/Components/TournamentMatchScoreDisplay.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/Components/TournamentMatchScoreDisplay.cs
@@ -127,12 +127,11 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
             score2Text.X = Math.Max(5 + score2Text.DrawWidth / 2, score2Bar.DrawWidth);
         }
 
-        private class MatchScoreCounter : ScoreCounter
+        private class MatchScoreCounter : CommaSeparatedScoreCounter
         {
             private OsuSpriteText displayedSpriteText;
 
             public MatchScoreCounter()
-                : base(useCommaSeparator: true)
             {
                 Margin = new MarginPadding { Top = bar_height, Horizontal = 10 };
             }
diff --git a/osu.Game/Graphics/UserInterface/CommaSeparatedScoreCounter.cs b/osu.Game/Graphics/UserInterface/CommaSeparatedScoreCounter.cs
new file mode 100644
index 0000000000..4e1c612f09
--- /dev/null
+++ b/osu.Game/Graphics/UserInterface/CommaSeparatedScoreCounter.cs
@@ -0,0 +1,24 @@
+// 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.Extensions.LocalisationExtensions;
+using osu.Framework.Graphics;
+using osu.Framework.Localisation;
+using osu.Game.Graphics.Sprites;
+
+namespace osu.Game.Graphics.UserInterface
+{
+    public abstract class CommaSeparatedScoreCounter : RollingCounter<double>
+    {
+        protected override double RollingDuration => 1000;
+        protected override Easing RollingEasing => Easing.Out;
+
+        protected override double GetProportionalDuration(double currentValue, double newValue) =>
+            currentValue > newValue ? currentValue - newValue : newValue - currentValue;
+
+        protected override LocalisableString FormatCount(double count) => ((long)count).ToLocalisableString(@"N0");
+
+        protected override OsuSpriteText CreateSpriteText()
+            => base.CreateSpriteText().With(s => s.Font = s.Font.With(fixedWidth: true));
+    }
+}
diff --git a/osu.Game/Graphics/UserInterface/ScoreCounter.cs b/osu.Game/Graphics/UserInterface/ScoreCounter.cs
index 778b0ecbc6..25f19aa0a9 100644
--- a/osu.Game/Graphics/UserInterface/ScoreCounter.cs
+++ b/osu.Game/Graphics/UserInterface/ScoreCounter.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 System;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.LocalisationExtensions;
 using osu.Framework.Graphics;
@@ -17,23 +16,14 @@ namespace osu.Game.Graphics.UserInterface
 
         public Bindable<int> RequiredDisplayDigits { get; } = new Bindable<int>();
 
-        private string formatString = string.Empty;
+        private string formatString;
 
         /// <summary>
         /// Displays score.
         /// </summary>
         /// <param name="leading">How many leading zeroes the counter will have.</param>
-        /// <param name="useCommaSeparator">Whether comma separators should be displayed.</param>
-        protected ScoreCounter(int leading = 0, bool useCommaSeparator = false)
+        protected ScoreCounter(int leading = 0)
         {
-            if (useCommaSeparator)
-            {
-                if (leading > 0)
-                    throw new ArgumentException("Should not mix leading zeroes and comma separators as it doesn't make sense");
-
-                formatString = @"N0";
-            }
-
             RequiredDisplayDigits.Value = leading;
             RequiredDisplayDigits.BindValueChanged(displayDigitsChanged, true);
         }
@@ -44,10 +34,8 @@ namespace osu.Game.Graphics.UserInterface
             UpdateDisplay();
         }
 
-        protected override double GetProportionalDuration(double currentValue, double newValue)
-        {
-            return currentValue > newValue ? currentValue - newValue : newValue - currentValue;
-        }
+        protected override double GetProportionalDuration(double currentValue, double newValue) =>
+            currentValue > newValue ? currentValue - newValue : newValue - currentValue;
 
         protected override LocalisableString FormatCount(double count) => ((long)count).ToLocalisableString(formatString);
 
diff --git a/osu.Game/Screens/Play/HUD/MatchScoreDisplay.cs b/osu.Game/Screens/Play/HUD/MatchScoreDisplay.cs
index 37282205f4..b1c07512dd 100644
--- a/osu.Game/Screens/Play/HUD/MatchScoreDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/MatchScoreDisplay.cs
@@ -146,12 +146,11 @@ namespace osu.Game.Screens.Play.HUD
             Score2Text.X = Math.Max(5 + Score2Text.DrawWidth / 2, score2Bar.DrawWidth);
         }
 
-        protected class MatchScoreCounter : ScoreCounter
+        protected class MatchScoreCounter : CommaSeparatedScoreCounter
         {
             private OsuSpriteText displayedSpriteText;
 
             public MatchScoreCounter()
-                : base(useCommaSeparator: true)
             {
                 Margin = new MarginPadding { Top = bar_height, Horizontal = 10 };
             }