From db55b98ed338b4c9c20d4c3a0ee593c7cae0db6a Mon Sep 17 00:00:00 2001
From: TheWildTree <thewildtree@outlook.com>
Date: Sun, 15 Mar 2020 22:03:54 +0100
Subject: [PATCH] Move grade column spacing logic to UserBasedTable

---
 .../Overlays/Rankings/Tables/RankingsTable.cs | 17 +++-------
 .../Overlays/Rankings/Tables/ScoresTable.cs   |  2 +-
 .../Rankings/Tables/UserBasedTable.cs         | 31 ++++++++++++++-----
 3 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/osu.Game/Overlays/Rankings/Tables/RankingsTable.cs b/osu.Game/Overlays/Rankings/Tables/RankingsTable.cs
index 17d0c9cf24..3fb8602cbc 100644
--- a/osu.Game/Overlays/Rankings/Tables/RankingsTable.cs
+++ b/osu.Game/Overlays/Rankings/Tables/RankingsTable.cs
@@ -70,16 +70,12 @@ namespace osu.Game.Overlays.Rankings.Tables
 
         protected abstract Drawable[] CreateAdditionalContent(TModel item);
 
+        protected virtual string HighlightedColumn => @"Performance";
+
         protected override Drawable CreateHeader(int index, TableColumn column)
         {
             var title = column?.Header ?? string.Empty;
-            var isHighlighted = HighlightedColumn() == title;
-            var isGrade = GradeColumns().Contains(title);
-
-            return new HeaderText(title, isHighlighted)
-            { 
-                Margin = new MarginPadding { Vertical = 5, Horizontal = isGrade ? 20 : 10 } 
-            };
+            return new HeaderText(title, title == HighlightedColumn);
         }
 
         protected abstract Country GetCountry(TModel item);
@@ -109,11 +105,7 @@ namespace osu.Game.Overlays.Rankings.Tables
             }
         };
 
-        protected virtual IEnumerable<string> GradeColumns() => new List<string>();
-
-        protected virtual string HighlightedColumn() => @"Performance";
-
-        private class HeaderText : OsuSpriteText
+        protected class HeaderText : OsuSpriteText
         {
             private readonly bool isHighlighted;
 
@@ -123,6 +115,7 @@ namespace osu.Game.Overlays.Rankings.Tables
 
                 Text = text;
                 Font = OsuFont.GetFont(size: 12);
+                Margin = new MarginPadding { Vertical = 5, Horizontal = 10 };
             }
 
             [BackgroundDependencyLoader]
diff --git a/osu.Game/Overlays/Rankings/Tables/ScoresTable.cs b/osu.Game/Overlays/Rankings/Tables/ScoresTable.cs
index 370ee506c2..9fae8e1897 100644
--- a/osu.Game/Overlays/Rankings/Tables/ScoresTable.cs
+++ b/osu.Game/Overlays/Rankings/Tables/ScoresTable.cs
@@ -33,6 +33,6 @@ namespace osu.Game.Overlays.Rankings.Tables
             }
         };
 
-        protected override string HighlightedColumn() => @"Ranked Score";
+        protected override string HighlightedColumn => @"Ranked Score";
     }
 }
diff --git a/osu.Game/Overlays/Rankings/Tables/UserBasedTable.cs b/osu.Game/Overlays/Rankings/Tables/UserBasedTable.cs
index 8ce31c8539..a6969f483f 100644
--- a/osu.Game/Overlays/Rankings/Tables/UserBasedTable.cs
+++ b/osu.Game/Overlays/Rankings/Tables/UserBasedTable.cs
@@ -19,17 +19,20 @@ namespace osu.Game.Overlays.Rankings.Tables
         {
         }
 
-        protected override IEnumerable<string> GradeColumns() => new List<string> { "SS", "S", "A" };
+        protected virtual IEnumerable<string> GradeColumns => new List<string> { "SS", "S", "A" };
 
-        protected override TableColumn[] CreateAdditionalHeaders()
-        {
-            var gradeColumns = GradeColumns().Select(grade => new TableColumn(grade, Anchor.Centre, new Dimension(GridSizeMode.AutoSize)));
-
-            return new[]
+        protected override TableColumn[] CreateAdditionalHeaders() => new[]
             {
                 new TableColumn("Accuracy", Anchor.Centre, new Dimension(GridSizeMode.AutoSize)),
                 new TableColumn("Play Count", Anchor.Centre, new Dimension(GridSizeMode.AutoSize)),
-            }.Concat(CreateUniqueHeaders()).Concat(gradeColumns).ToArray();
+            }.Concat(CreateUniqueHeaders())
+             .Concat(GradeColumns.Select(grade => new TableColumn(grade, Anchor.Centre, new Dimension(GridSizeMode.AutoSize))))
+             .ToArray();
+
+        protected override Drawable CreateHeader(int index, TableColumn column)
+        {
+            var title = column?.Header ?? string.Empty;
+            return new UserTableHeaderText(title, HighlightedColumn == title, GradeColumns.Contains(title));
         }
 
         protected sealed override Country GetCountry(UserStatistics item) => item.User.Country;
@@ -60,5 +63,19 @@ namespace osu.Game.Overlays.Rankings.Tables
         protected abstract TableColumn[] CreateUniqueHeaders();
 
         protected abstract Drawable[] CreateUniqueContent(UserStatistics item);
+
+        private class UserTableHeaderText : HeaderText
+        {
+            public UserTableHeaderText(string text, bool isHighlighted, bool isGrade)
+                : base(text, isHighlighted)
+            {
+                Margin = new MarginPadding
+                {
+                    // Grade columns have extra horizontal padding for readibility
+                    Horizontal = isGrade ? 20 : 10,
+                    Vertical = 5
+                };
+            }
+        }
     }
 }