From 2b0bdd1db5deee1efcae3d7388aae3c4a03e2d76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 12 Feb 2020 19:15:37 +0100
Subject: [PATCH] Refactor tooltip construction

---
 .../Profile/Header/Components/RankGraph.cs    |  9 +++------
 .../Sections/Historical/UserHistoryGraph.cs   |  9 +++------
 osu.Game/Overlays/Profile/UserGraph.cs        | 20 ++++++++++++++-----
 3 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/osu.Game/Overlays/Profile/Header/Components/RankGraph.cs b/osu.Game/Overlays/Profile/Header/Components/RankGraph.cs
index b62864364b..097b68f3aa 100644
--- a/osu.Game/Overlays/Profile/Header/Components/RankGraph.cs
+++ b/osu.Game/Overlays/Profile/Header/Components/RankGraph.cs
@@ -62,16 +62,13 @@ namespace osu.Game.Overlays.Profile.Header.Components
             Graph.FadeTo(Data.Length > 1 ? 1 : 0, FADE_DURATION, Easing.Out);
         }
 
-        protected override object GetTooltipContent()
+        protected override object GetTooltipContent(int index, int rank)
         {
-            if (Statistics.Value?.Ranks.Global == null)
-                return null;
-
-            var days = ranked_days - Data[DataIndex].Key + 1;
+            var days = ranked_days - index + 1;
 
             return new TooltipDisplayContent
             {
-                Rank = $"#{Data[DataIndex].Value:#,##0}",
+                Rank = $"#{rank:#,##0}",
                 Time = days == 0 ? "now" : $"{days} days ago"
             };
         }
diff --git a/osu.Game/Overlays/Profile/Sections/Historical/UserHistoryGraph.cs b/osu.Game/Overlays/Profile/Sections/Historical/UserHistoryGraph.cs
index 2e389d3ac6..d37454d607 100644
--- a/osu.Game/Overlays/Profile/Sections/Historical/UserHistoryGraph.cs
+++ b/osu.Game/Overlays/Profile/Sections/Historical/UserHistoryGraph.cs
@@ -42,15 +42,12 @@ namespace osu.Game.Overlays.Profile.Sections.Historical
             }
         }
 
-        protected override object GetTooltipContent()
+        protected override object GetTooltipContent(DateTime date, long playCount)
         {
-            if (!Data?.Any() ?? true)
-                return null;
-
             return new TooltipDisplayContent
             {
-                Count = Data[DataIndex].Value.ToString("N0"),
-                Date = Data[DataIndex].Key.ToString("MMMM yyyy")
+                Count = playCount.ToString("N0"),
+                Date = date.ToString("MMMM yyyy")
             };
         }
 
diff --git a/osu.Game/Overlays/Profile/UserGraph.cs b/osu.Game/Overlays/Profile/UserGraph.cs
index 122a6ded36..f1f5b50cd3 100644
--- a/osu.Game/Overlays/Profile/UserGraph.cs
+++ b/osu.Game/Overlays/Profile/UserGraph.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Overlays.Profile
 
         protected readonly UserLineGraph Graph;
         protected KeyValuePair<TKey, TValue>[] Data;
-        protected int DataIndex;
+        private int dataIndex;
 
         protected UserGraph()
         {
@@ -33,7 +33,7 @@ namespace osu.Game.Overlays.Profile
                 Alpha = 0
             });
 
-            Graph.OnBallMove += i => DataIndex = i;
+            Graph.OnBallMove += i => dataIndex = i;
         }
 
         [BackgroundDependencyLoader]
@@ -71,11 +71,21 @@ namespace osu.Game.Overlays.Profile
 
         public ITooltip GetCustomTooltip() => GetTooltip();
 
-        public object TooltipContent => GetTooltipContent();
-
         protected abstract UserGraphTooltip GetTooltip();
 
-        protected abstract object GetTooltipContent();
+        public object TooltipContent
+        {
+            get
+            {
+                if (Data == null || Data.Length == 0)
+                    return null;
+
+                var (key, value) = Data[dataIndex];
+                return GetTooltipContent(key, value);
+            }
+        }
+
+        protected abstract object GetTooltipContent(TKey key, TValue value);
 
         protected class UserLineGraph : LineGraph
         {