From ee9fa11d142ed4fe14ca3dc06bfcc9edb56c02f5 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <email@iisalman.me>
Date: Wed, 19 Aug 2020 07:47:02 +0300
Subject: [PATCH] Use `With(s => ...)` extension for better readability

---
 .../Gameplay/Components/MatchScoreDisplay.cs  | 23 ++++++++++---------
 .../Expanded/Statistics/AccuracyStatistic.cs  | 10 ++++----
 .../Expanded/Statistics/CounterStatistic.cs   | 10 ++++----
 .../Ranking/Expanded/TotalScoreCounter.cs     | 14 +++++------
 4 files changed, 26 insertions(+), 31 deletions(-)

diff --git a/osu.Game.Tournament/Screens/Gameplay/Components/MatchScoreDisplay.cs b/osu.Game.Tournament/Screens/Gameplay/Components/MatchScoreDisplay.cs
index 25417921bc..695c6d6f3e 100644
--- a/osu.Game.Tournament/Screens/Gameplay/Components/MatchScoreDisplay.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/Components/MatchScoreDisplay.cs
@@ -137,19 +137,20 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
 
             public bool Winning
             {
-                set => displayedSpriteText.Font = value
+                set => updateFont(value);
+            }
+
+            protected override OsuSpriteText CreateSpriteText() => base.CreateSpriteText().With(s =>
+            {
+                displayedSpriteText = s;
+                displayedSpriteText.Spacing = new Vector2(-6);
+                updateFont(false);
+            });
+
+            private void updateFont(bool winning)
+                => displayedSpriteText.Font = winning
                     ? OsuFont.Torus.With(weight: FontWeight.Bold, size: 50, fixedWidth: true)
                     : OsuFont.Torus.With(weight: FontWeight.Regular, size: 40, fixedWidth: true);
-            }
-
-            protected override OsuSpriteText CreateSpriteText()
-            {
-                displayedSpriteText = base.CreateSpriteText();
-                displayedSpriteText.Spacing = new Vector2(-6);
-                Winning = false;
-
-                return displayedSpriteText;
-            }
         }
     }
 }
diff --git a/osu.Game/Screens/Ranking/Expanded/Statistics/AccuracyStatistic.cs b/osu.Game/Screens/Ranking/Expanded/Statistics/AccuracyStatistic.cs
index 921ad80976..6933456e7e 100644
--- a/osu.Game/Screens/Ranking/Expanded/Statistics/AccuracyStatistic.cs
+++ b/osu.Game/Screens/Ranking/Expanded/Statistics/AccuracyStatistic.cs
@@ -49,13 +49,11 @@ namespace osu.Game.Screens.Ranking.Expanded.Statistics
             public override void Increment(double amount)
                 => Current.Value += amount;
 
-            protected override OsuSpriteText CreateSpriteText()
+            protected override OsuSpriteText CreateSpriteText() => base.CreateSpriteText().With(s =>
             {
-                var spriteText = base.CreateSpriteText();
-                spriteText.Font = OsuFont.Torus.With(size: 20, fixedWidth: true);
-                spriteText.Spacing = new Vector2(-2, 0);
-                return spriteText;
-            }
+                s.Font = OsuFont.Torus.With(size: 20, fixedWidth: true);
+                s.Spacing = new Vector2(-2, 0);
+            });
         }
     }
 }
diff --git a/osu.Game/Screens/Ranking/Expanded/Statistics/CounterStatistic.cs b/osu.Game/Screens/Ranking/Expanded/Statistics/CounterStatistic.cs
index cc0f49c968..043a560d12 100644
--- a/osu.Game/Screens/Ranking/Expanded/Statistics/CounterStatistic.cs
+++ b/osu.Game/Screens/Ranking/Expanded/Statistics/CounterStatistic.cs
@@ -44,13 +44,11 @@ namespace osu.Game.Screens.Ranking.Expanded.Statistics
 
             protected override Easing RollingEasing => AccuracyCircle.ACCURACY_TRANSFORM_EASING;
 
-            protected override OsuSpriteText CreateSpriteText()
+            protected override OsuSpriteText CreateSpriteText() => base.CreateSpriteText().With(s =>
             {
-                var spriteText = base.CreateSpriteText();
-                spriteText.Font = OsuFont.Torus.With(size: 20, fixedWidth: true);
-                spriteText.Spacing = new Vector2(-2, 0);
-                return spriteText;
-            }
+                s.Font = OsuFont.Torus.With(size: 20, fixedWidth: true);
+                s.Spacing = new Vector2(-2, 0);
+            });
 
             public override void Increment(int amount)
                 => Current.Value += amount;
diff --git a/osu.Game/Screens/Ranking/Expanded/TotalScoreCounter.cs b/osu.Game/Screens/Ranking/Expanded/TotalScoreCounter.cs
index b0060d19ac..7f6fd1eabe 100644
--- a/osu.Game/Screens/Ranking/Expanded/TotalScoreCounter.cs
+++ b/osu.Game/Screens/Ranking/Expanded/TotalScoreCounter.cs
@@ -28,16 +28,14 @@ namespace osu.Game.Screens.Ranking.Expanded
 
         protected override string FormatCount(long count) => count.ToString("N0");
 
-        protected override OsuSpriteText CreateSpriteText()
+        protected override OsuSpriteText CreateSpriteText() => base.CreateSpriteText().With(s =>
         {
-            var spriteText = base.CreateSpriteText();
-            spriteText.Anchor = Anchor.TopCentre;
-            spriteText.Origin = Anchor.TopCentre;
+            s.Anchor = Anchor.TopCentre;
+            s.Origin = Anchor.TopCentre;
 
-            spriteText.Font = OsuFont.Torus.With(size: 60, weight: FontWeight.Light, fixedWidth: true);
-            spriteText.Spacing = new Vector2(-5, 0);
-            return spriteText;
-        }
+            s.Font = OsuFont.Torus.With(size: 60, weight: FontWeight.Light, fixedWidth: true);
+            s.Spacing = new Vector2(-5, 0);
+        });
 
         public override void Increment(long amount)
             => Current.Value += amount;