From 3cb9103fe094fdfe5845a877e9bd3bf4307f4dd2 Mon Sep 17 00:00:00 2001
From: Lucas A <game4allyt@gmail.com>
Date: Sun, 27 Sep 2020 09:37:57 +0200
Subject: [PATCH] Inherit PerformanceStatistic from CounterStatistic

---
 .../Expanded/Statistics/CounterStatistic.cs   |  8 ++---
 .../Statistics/PerformanceStatistic.cs        | 29 ++-----------------
 2 files changed, 7 insertions(+), 30 deletions(-)

diff --git a/osu.Game/Screens/Ranking/Expanded/Statistics/CounterStatistic.cs b/osu.Game/Screens/Ranking/Expanded/Statistics/CounterStatistic.cs
index e820831809..1f8deb4d59 100644
--- a/osu.Game/Screens/Ranking/Expanded/Statistics/CounterStatistic.cs
+++ b/osu.Game/Screens/Ranking/Expanded/Statistics/CounterStatistic.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Screens.Ranking.Expanded.Statistics
     {
         private readonly int count;
 
-        private RollingCounter<int> counter;
+        protected RollingCounter<int> Counter;
 
         /// <summary>
         /// Creates a new <see cref="CounterStatistic"/>.
@@ -33,12 +33,12 @@ namespace osu.Game.Screens.Ranking.Expanded.Statistics
         public override void Appear()
         {
             base.Appear();
-            counter.Current.Value = count;
+            Counter.Current.Value = count;
         }
 
-        protected override Drawable CreateContent() => counter = new Counter();
+        protected override Drawable CreateContent() => Counter = new StatisticCounter();
 
-        private class Counter : RollingCounter<int>
+        private class StatisticCounter : RollingCounter<int>
         {
             protected override double RollingDuration => AccuracyCircle.ACCURACY_TRANSFORM_DURATION;
 
diff --git a/osu.Game/Screens/Ranking/Expanded/Statistics/PerformanceStatistic.cs b/osu.Game/Screens/Ranking/Expanded/Statistics/PerformanceStatistic.cs
index 11edab6636..b84d0b7ff7 100644
--- a/osu.Game/Screens/Ranking/Expanded/Statistics/PerformanceStatistic.cs
+++ b/osu.Game/Screens/Ranking/Expanded/Statistics/PerformanceStatistic.cs
@@ -4,18 +4,12 @@
 using System.Threading;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Framework.Graphics;
 using osu.Game.Beatmaps;
-using osu.Game.Graphics;
-using osu.Game.Graphics.Sprites;
-using osu.Game.Graphics.UserInterface;
 using osu.Game.Scoring;
-using osu.Game.Screens.Ranking.Expanded.Accuracy;
-using osuTK;
 
 namespace osu.Game.Screens.Ranking.Expanded.Statistics
 {
-    public class PerformanceStatistic : StatisticDisplay
+    public class PerformanceStatistic : CounterStatistic
     {
         private readonly ScoreInfo score;
 
@@ -23,10 +17,8 @@ namespace osu.Game.Screens.Ranking.Expanded.Statistics
 
         private readonly CancellationTokenSource cancellationTokenSource = new CancellationTokenSource();
 
-        private RollingCounter<int> counter;
-
         public PerformanceStatistic(ScoreInfo score)
-            : base("PP")
+            : base("PP", 0)
         {
             this.score = score;
         }
@@ -49,22 +41,7 @@ namespace osu.Game.Screens.Ranking.Expanded.Statistics
         public override void Appear()
         {
             base.Appear();
-            counter.Current.BindTo(performance);
-        }
-
-        protected override Drawable CreateContent() => counter = new Counter();
-
-        private class Counter : RollingCounter<int>
-        {
-            protected override double RollingDuration => AccuracyCircle.ACCURACY_TRANSFORM_DURATION;
-
-            protected override Easing RollingEasing => AccuracyCircle.ACCURACY_TRANSFORM_EASING;
-
-            protected override OsuSpriteText CreateSpriteText() => base.CreateSpriteText().With(s =>
-            {
-                s.Font = OsuFont.Torus.With(size: 20, fixedWidth: true);
-                s.Spacing = new Vector2(-2, 0);
-            });
+            Counter.Current.BindTo(performance);
         }
 
         protected override void Dispose(bool isDisposing)