Merge pull request #16726 from dekrain/leaderboard-score-tooltip

Add basic tooltip for leaderboard scores

osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapLeaderboard.cs

@@ -197,7 +197,24 @@ namespace osu.Game.Tests.Visual.SongSelect
                     Accuracy = 1,
                     MaxCombo = 244,
                     TotalScore = 1707827,
-                    //Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
+                    Mods = new Mod[]
+                    {
+                        new OsuModHidden(),
+                        new OsuModHardRock(),
+                        new OsuModFlashlight
+                        {
+                            FollowDelay = { Value = 200 },
+                            SizeMultiplier = { Value = 5 },
+                        },
+                        new OsuModDifficultyAdjust
+                        {
+                            CircleSize = { Value = 11 },
+                            ApproachRate = { Value = 10 },
+                            OverallDifficulty = { Value = 10 },
+                            DrainRate = { Value = 10 },
+                            ExtendedLimits = { Value = true }
+                        }
+                    },
                     Ruleset = new OsuRuleset().RulesetInfo,
                     BeatmapInfo = beatmapInfo,
                     User = new APIUser
@@ -217,7 +234,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                     Accuracy = 1,
                     MaxCombo = 244,
                     TotalScore = 1707827,
-                    //Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
+                    Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
                     BeatmapInfo = beatmapInfo,
                     Ruleset = new OsuRuleset().RulesetInfo,
                     User = new APIUser
@@ -237,7 +254,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                     Accuracy = 1,
                     MaxCombo = 244,
                     TotalScore = 1707827,
-                    //Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
+                    Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
                     BeatmapInfo = beatmapInfo,
                     Ruleset = new OsuRuleset().RulesetInfo,
 
@@ -258,7 +275,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                     Accuracy = 1,
                     MaxCombo = 244,
                     TotalScore = 1707827,
-                    //Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
+                    Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
                     BeatmapInfo = beatmapInfo,
                     Ruleset = new OsuRuleset().RulesetInfo,
 
@@ -279,7 +296,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                     Accuracy = 1,
                     MaxCombo = 244,
                     TotalScore = 1707827,
-                    //Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
+                    Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
                     BeatmapInfo = beatmapInfo,
                     Ruleset = new OsuRuleset().RulesetInfo,
 
@@ -300,7 +317,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                     Accuracy = 0.9826,
                     MaxCombo = 244,
                     TotalScore = 1707827,
-                    //Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
+                    Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
                     BeatmapInfo = beatmapInfo,
                     Ruleset = new OsuRuleset().RulesetInfo,
 
@@ -321,7 +338,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                     Accuracy = 0.9654,
                     MaxCombo = 244,
                     TotalScore = 1707827,
-                    //Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
+                    Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
                     BeatmapInfo = beatmapInfo,
                     Ruleset = new OsuRuleset().RulesetInfo,
 
@@ -342,7 +359,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                     Accuracy = 0.6025,
                     MaxCombo = 244,
                     TotalScore = 1707827,
-                    //Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
+                    Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
                     BeatmapInfo = beatmapInfo,
                     Ruleset = new OsuRuleset().RulesetInfo,
 
@@ -363,7 +380,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                     Accuracy = 0.5140,
                     MaxCombo = 244,
                     TotalScore = 1707827,
-                    //Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
+                    Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
                     BeatmapInfo = beatmapInfo,
                     Ruleset = new OsuRuleset().RulesetInfo,
 
@@ -384,7 +401,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                     Accuracy = 0.4222,
                     MaxCombo = 244,
                     TotalScore = 1707827,
-                    //Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
+                    Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
                     BeatmapInfo = beatmapInfo,
                     Ruleset = new OsuRuleset().RulesetInfo,
 

osu.Game/Beatmaps/Drawables/DifficultyIconTooltip.cs

@@ -30,6 +30,7 @@ namespace osu.Game.Beatmaps.Drawables
             {
                 background = new Box
                 {
+                    Alpha = 0.9f,
                     RelativeSizeAxes = Axes.Both
                 },
                 new FillFlowContainer

osu.Game/Online/Leaderboards/LeaderboardScore.cs

@@ -32,7 +32,7 @@ using osu.Game.Utils;
 
 namespace osu.Game.Online.Leaderboards
 {
-    public class LeaderboardScore : OsuClickableContainer, IHasContextMenu
+    public class LeaderboardScore : OsuClickableContainer, IHasContextMenu, IHasCustomTooltip<ScoreInfo>
     {
         public const float HEIGHT = 60;
 
@@ -70,6 +70,9 @@ namespace osu.Game.Online.Leaderboards
         [Resolved]
         private Storage storage { get; set; }
 
+        public ITooltip<ScoreInfo> GetCustomTooltip() => new LeaderboardScoreTooltip();
+        public virtual ScoreInfo TooltipContent => Score;
+
         public LeaderboardScore(ScoreInfo score, int? rank, bool isOnlineScope = true)
         {
             Score = score;
@@ -183,7 +186,6 @@ namespace osu.Game.Online.Leaderboards
                                                     Anchor = Anchor.BottomLeft,
                                                     AutoSizeAxes = Axes.Both,
                                                     Direction = FillDirection.Horizontal,
-                                                    Spacing = new Vector2(10f, 0f),
                                                     Margin = new MarginPadding { Left = edge_margin },
                                                     Children = statisticsLabels
                                                 },
@@ -228,7 +230,6 @@ namespace osu.Game.Online.Leaderboards
                                     Origin = Anchor.BottomRight,
                                     AutoSizeAxes = Axes.Both,
                                     Direction = FillDirection.Horizontal,
-                                    Spacing = new Vector2(1),
                                     ChildrenEnumerable = Score.Mods.Select(mod => new ModIcon(mod) { Scale = new Vector2(0.375f) })
                                 },
                             },
@@ -313,6 +314,7 @@ namespace osu.Game.Online.Leaderboards
                 {
                     AutoSizeAxes = Axes.Both,
                     Direction = FillDirection.Horizontal,
+                    Padding = new MarginPadding { Right = 10 },
                     Children = new Drawable[]
                     {
                         new Container

osu.Game/Online/Leaderboards/LeaderboardScoreTooltip.cs

@@ -0,0 +1,219 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Cursor;
+using osu.Game.Scoring;
+using osuTK;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Graphics;
+using osu.Framework.Allocation;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.UI;
+
+#nullable enable
+
+namespace osu.Game.Online.Leaderboards
+{
+    public class LeaderboardScoreTooltip : VisibilityContainer, ITooltip<ScoreInfo>
+    {
+        private OsuSpriteText timestampLabel = null!;
+        private FillFlowContainer<HitResultCell> topScoreStatistics = null!;
+        private FillFlowContainer<HitResultCell> bottomScoreStatistics = null!;
+        private FillFlowContainer<ModCell> modStatistics = null!;
+
+        public LeaderboardScoreTooltip()
+        {
+            AutoSizeAxes = Axes.Both;
+            AutoSizeDuration = 200;
+            AutoSizeEasing = Easing.OutQuint;
+
+            Masking = true;
+            CornerRadius = 5;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            InternalChildren = new Drawable[]
+            {
+                new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Alpha = 0.9f,
+                    Colour = colours.Gray3,
+                },
+                new FillFlowContainer
+                {
+                    Margin = new MarginPadding(5),
+                    Spacing = new Vector2(10),
+                    AutoSizeAxes = Axes.Both,
+                    Direction = FillDirection.Vertical,
+                    Children = new Drawable[]
+                    {
+                        // Info row
+                        timestampLabel = new OsuSpriteText
+                        {
+                            Font = OsuFont.GetFont(size: 12, weight: FontWeight.SemiBold),
+                        },
+                        // Mods row
+                        modStatistics = new FillFlowContainer<ModCell>
+                        {
+                            AutoSizeAxes = Axes.Both,
+                            Direction = FillDirection.Vertical,
+                            Spacing = new Vector2(5, 0),
+                        },
+                        new FillFlowContainer
+                        {
+                            AutoSizeAxes = Axes.Both,
+                            Direction = FillDirection.Vertical,
+                            Children = new Drawable[]
+                            {
+                                // Actual stats rows
+                                topScoreStatistics = new FillFlowContainer<HitResultCell>
+                                {
+                                    AutoSizeAxes = Axes.Both,
+                                    Direction = FillDirection.Horizontal,
+                                    Spacing = new Vector2(10, 0),
+                                },
+                                bottomScoreStatistics = new FillFlowContainer<HitResultCell>
+                                {
+                                    AutoSizeAxes = Axes.Both,
+                                    Direction = FillDirection.Horizontal,
+                                    Spacing = new Vector2(10, 0),
+                                },
+                            }
+                        },
+                    }
+                }
+            };
+        }
+
+        private ScoreInfo? displayedScore;
+
+        public void SetContent(ScoreInfo score)
+        {
+            if (displayedScore?.Equals(score) == true)
+                return;
+
+            displayedScore = score;
+
+            timestampLabel.Text = $"Played on {score.Date.ToLocalTime():d MMMM yyyy HH:mm}";
+
+            modStatistics.Clear();
+            topScoreStatistics.Clear();
+            bottomScoreStatistics.Clear();
+
+            foreach (var mod in score.Mods)
+            {
+                modStatistics.Add(new ModCell(mod));
+            }
+
+            foreach (var result in score.GetStatisticsForDisplay())
+            {
+                if (result.Result > HitResult.Perfect)
+                    bottomScoreStatistics.Add(new HitResultCell(result));
+                else
+                    topScoreStatistics.Add(new HitResultCell(result));
+            }
+        }
+
+        protected override void PopIn() => this.FadeIn(20, Easing.OutQuint);
+        protected override void PopOut() => this.FadeOut(80, Easing.OutQuint);
+
+        public void Move(Vector2 pos) => Position = pos;
+
+        private class HitResultCell : CompositeDrawable
+        {
+            private readonly string displayName;
+            private readonly HitResult result;
+            private readonly int count;
+
+            public HitResultCell(HitResultDisplayStatistic stat)
+            {
+                AutoSizeAxes = Axes.Both;
+
+                displayName = stat.DisplayName;
+                result = stat.Result;
+                count = stat.Count;
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(OsuColour colours)
+            {
+                InternalChild = new FillFlowContainer
+                {
+                    Height = 12,
+                    AutoSizeAxes = Axes.X,
+                    Direction = FillDirection.Horizontal,
+                    Spacing = new Vector2(5f, 0f),
+                    Children = new Drawable[]
+                    {
+                        new OsuSpriteText
+                        {
+                            Font = OsuFont.Torus.With(size: 12, weight: FontWeight.SemiBold),
+                            Text = displayName.ToUpperInvariant(),
+                            Colour = colours.ForHitResult(result),
+                        },
+                        new OsuSpriteText
+                        {
+                            Font = OsuFont.GetFont(size: 12, weight: FontWeight.SemiBold),
+                            Text = count.ToString(),
+                        },
+                    }
+                };
+            }
+        }
+
+        private class ModCell : CompositeDrawable
+        {
+            private readonly Mod mod;
+
+            public ModCell(Mod mod)
+            {
+                AutoSizeAxes = Axes.Both;
+                this.mod = mod;
+            }
+
+            [BackgroundDependencyLoader]
+            private void load()
+            {
+                FillFlowContainer container;
+                InternalChild = container = new FillFlowContainer
+                {
+                    Height = 15,
+                    AutoSizeAxes = Axes.X,
+                    Direction = FillDirection.Horizontal,
+                    Spacing = new Vector2(2f, 0f),
+                    Children = new Drawable[]
+                    {
+                        new ModIcon(mod, showTooltip: false).With(icon =>
+                        {
+                            icon.Origin = Anchor.CentreLeft;
+                            icon.Anchor = Anchor.CentreLeft;
+                            icon.Scale = new Vector2(15f / icon.Height);
+                        }),
+                    }
+                };
+
+                string description = mod.SettingDescription;
+
+                if (!string.IsNullOrEmpty(description))
+                {
+                    container.Add(new OsuSpriteText
+                    {
+                        RelativeSizeAxes = Axes.Y,
+                        Font = OsuFont.GetFont(size: 12, weight: FontWeight.SemiBold),
+                        Text = mod.SettingDescription,
+                        Origin = Anchor.CentreLeft,
+                        Anchor = Anchor.CentreLeft,
+                        Margin = new MarginPadding { Top = 1 },
+                    });
+                }
+            }
+        }
+    }
+}

osu.Game/Screens/OnlinePlay/Match/Components/MatchLeaderboardScore.cs

@@ -14,6 +14,8 @@ namespace osu.Game.Screens.OnlinePlay.Match.Components
     {
         private readonly APIUserScoreAggregate score;
 
+        public override ScoreInfo TooltipContent => null; // match aggregate scores can't show statistics that the custom tooltip displays.
+
         public MatchLeaderboardScore(APIUserScoreAggregate score, int? rank, bool isOnlineScope = true)
             : base(score.CreateScoreInfo(), rank, isOnlineScope)
         {