From 848f3bbf51b0b44d48f7424d4a48fc0bc3e369a7 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Mon, 17 Aug 2020 21:09:55 -0700
Subject: [PATCH 1/3] Show tooltip of leaderboard score rank when 1000 or
 higher

---
 .../Online/Leaderboards/LeaderboardScore.cs   | 30 ++++++++++++-------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Online/Leaderboards/LeaderboardScore.cs b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
index b60d71cfe7..662c02df0e 100644
--- a/osu.Game/Online/Leaderboards/LeaderboardScore.cs
+++ b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
@@ -82,20 +82,10 @@ namespace osu.Game.Online.Leaderboards
 
             Children = new Drawable[]
             {
-                new Container
+                new RankLabel(rank)
                 {
                     RelativeSizeAxes = Axes.Y,
                     Width = rank_width,
-                    Children = new[]
-                    {
-                        new OsuSpriteText
-                        {
-                            Anchor = Anchor.Centre,
-                            Origin = Anchor.Centre,
-                            Font = OsuFont.GetFont(size: 20, italics: true),
-                            Text = rank == null ? "-" : rank.Value.ToMetric(decimals: rank < 100000 ? 1 : 0),
-                        },
-                    },
                 },
                 content = new Container
                 {
@@ -356,6 +346,24 @@ namespace osu.Game.Online.Leaderboards
             }
         }
 
+        private class RankLabel : Container, IHasTooltip
+        {
+            public RankLabel(int? rank)
+            {
+                TooltipText = rank == null || rank < 1000 ? null : $"{rank}";
+
+                Child = new OsuSpriteText
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Font = OsuFont.GetFont(size: 20, italics: true),
+                    Text = rank == null ? "-" : rank.Value.ToMetric(decimals: rank < 100000 ? 1 : 0),
+                };
+            }
+
+            public string TooltipText { get; }
+        }
+
         public class LeaderboardScoreStatistic
         {
             public IconUsage Icon;

From e0383f61008db34bbcc3317e9ad12ff94f56ec7b Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Mon, 17 Aug 2020 22:07:04 -0700
Subject: [PATCH 2/3] Change format of rank tooltip

---
 osu.Game/Online/Leaderboards/LeaderboardScore.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Online/Leaderboards/LeaderboardScore.cs b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
index 662c02df0e..a4c20d1b9e 100644
--- a/osu.Game/Online/Leaderboards/LeaderboardScore.cs
+++ b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
@@ -350,7 +350,7 @@ namespace osu.Game.Online.Leaderboards
         {
             public RankLabel(int? rank)
             {
-                TooltipText = rank == null || rank < 1000 ? null : $"{rank}";
+                TooltipText = rank == null || rank < 1000 ? null : $"#{rank:N0}";
 
                 Child = new OsuSpriteText
                 {

From 4d6b52a0d6a9a9d8e3d847c8d610d978b80d7802 Mon Sep 17 00:00:00 2001
From: Joseph Madamba <madamba.joehu@outlook.com>
Date: Mon, 17 Aug 2020 23:08:51 -0700
Subject: [PATCH 3/3] Simply condition

Co-authored-by: Dean Herbert <pe@ppy.sh>
---
 osu.Game/Online/Leaderboards/LeaderboardScore.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Online/Leaderboards/LeaderboardScore.cs b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
index a4c20d1b9e..87b283f6b5 100644
--- a/osu.Game/Online/Leaderboards/LeaderboardScore.cs
+++ b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
@@ -350,7 +350,8 @@ namespace osu.Game.Online.Leaderboards
         {
             public RankLabel(int? rank)
             {
-                TooltipText = rank == null || rank < 1000 ? null : $"#{rank:N0}";
+                if (rank >= 1000)
+                    TooltipText = $"#{rank:N0}";
 
                 Child = new OsuSpriteText
                 {