Merge pull request #8341 from smoogipoo/score-panel-scrolling

Make score panel scroll if off-screen

osu.Game/Graphics/OsuColour.cs

@@ -3,6 +3,7 @@
 
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Scoring;
 using osu.Game.Scoring;
 using osuTK.Graphics;
 
@@ -47,23 +48,49 @@ namespace osu.Game.Graphics
             {
                 case ScoreRank.XH:
                 case ScoreRank.X:
-                    return Color4Extensions.FromHex(@"ce1c9d");
+                    return Color4Extensions.FromHex(@"de31ae");
 
                 case ScoreRank.SH:
                 case ScoreRank.S:
-                    return Color4Extensions.FromHex(@"00a8b5");
+                    return Color4Extensions.FromHex(@"02b5c3");
 
                 case ScoreRank.A:
-                    return Color4Extensions.FromHex(@"7cce14");
+                    return Color4Extensions.FromHex(@"88da20");
 
                 case ScoreRank.B:
                     return Color4Extensions.FromHex(@"e3b130");
 
                 case ScoreRank.C:
-                    return Color4Extensions.FromHex(@"f18252");
+                    return Color4Extensions.FromHex(@"ff8e5d");
 
                 default:
-                    return Color4Extensions.FromHex(@"e95353");
+                    return Color4Extensions.FromHex(@"ff5a5a");
+            }
+        }
+
+        /// <summary>
+        /// Retrieves the colour for a <see cref="HitResult"/>.
+        /// </summary>
+        public Color4 ForHitResult(HitResult judgement)
+        {
+            switch (judgement)
+            {
+                case HitResult.Perfect:
+                case HitResult.Great:
+                    return Blue;
+
+                case HitResult.Ok:
+                case HitResult.Good:
+                    return Green;
+
+                case HitResult.Meh:
+                    return Yellow;
+
+                case HitResult.Miss:
+                    return Red;
+
+                default:
+                    return Color4.White;
             }
         }
 

osu.Game/Rulesets/Judgements/DrawableJudgement.cs

@@ -12,7 +12,6 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Skinning;
-using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Judgements
 {
@@ -68,7 +67,7 @@ namespace osu.Game.Rulesets.Judgements
                 {
                     Text = Result.Type.GetDescription().ToUpperInvariant(),
                     Font = OsuFont.Numeric.With(size: 20),
-                    Colour = judgementColour(Result.Type),
+                    Colour = colours.ForHitResult(Result.Type),
                     Scale = new Vector2(0.85f, 1),
                 }, confineMode: ConfineMode.NoScaling)
             };
@@ -110,28 +109,5 @@ namespace osu.Game.Rulesets.Judgements
 
             Expire(true);
         }
-
-        private Color4 judgementColour(HitResult judgement)
-        {
-            switch (judgement)
-            {
-                case HitResult.Perfect:
-                case HitResult.Great:
-                    return colours.Blue;
-
-                case HitResult.Ok:
-                case HitResult.Good:
-                    return colours.Green;
-
-                case HitResult.Meh:
-                    return colours.Yellow;
-
-                case HitResult.Miss:
-                    return colours.Red;
-
-                default:
-                    return Color4.White;
-            }
-        }
     }
 }

osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs

@@ -5,7 +5,6 @@ using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Framework.Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Localisation;
@@ -63,7 +62,7 @@ namespace osu.Game.Screens.Ranking.Expanded
 
             var bottomStatistics = new List<StatisticDisplay>();
             foreach (var stat in score.SortedStatistics)
-                bottomStatistics.Add(new CounterStatistic(stat.Key.GetDescription(), stat.Value));
+                bottomStatistics.Add(new HitResultStatistic(stat.Key, stat.Value));
 
             statisticDisplays.AddRange(topStatistics);
             statisticDisplays.AddRange(bottomStatistics);
@@ -205,6 +204,13 @@ namespace osu.Game.Screens.Ranking.Expanded
                                 }
                             }
                         }
+                    },
+                    new OsuSpriteText
+                    {
+                        Anchor = Anchor.TopCentre,
+                        Origin = Anchor.TopCentre,
+                        Font = OsuFont.GetFont(size: 10, weight: FontWeight.SemiBold),
+                        Text = $"Played on {score.Date.ToLocalTime():g}"
                     }
                 }
             };

osu.Game/Screens/Ranking/Expanded/Statistics/HitResultStatistic.cs

@@ -0,0 +1,27 @@
+// 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.Allocation;
+using osu.Framework.Extensions;
+using osu.Game.Graphics;
+using osu.Game.Rulesets.Scoring;
+
+namespace osu.Game.Screens.Ranking.Expanded.Statistics
+{
+    public class HitResultStatistic : CounterStatistic
+    {
+        private readonly HitResult result;
+
+        public HitResultStatistic(HitResult result, int count)
+            : base(result.GetDescription(), count)
+        {
+            this.result = result;
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            HeaderText.Colour = colours.ForHitResult(result);
+        }
+    }
+}

osu.Game/Screens/Ranking/Expanded/Statistics/StatisticDisplay.cs

@@ -6,6 +6,7 @@ using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 
@@ -16,8 +17,9 @@ namespace osu.Game.Screens.Ranking.Expanded.Statistics
     /// </summary>
     public abstract class StatisticDisplay : CompositeDrawable
     {
-        private readonly string header;
+        protected SpriteText HeaderText { get; private set; }
 
+        private readonly string header;
         private Drawable content;
 
         /// <summary>
@@ -53,7 +55,7 @@ namespace osu.Game.Screens.Ranking.Expanded.Statistics
                                 RelativeSizeAxes = Axes.Both,
                                 Colour = Color4Extensions.FromHex("#222")
                             },
-                            new OsuSpriteText
+                            HeaderText = new OsuSpriteText
                             {
                                 Anchor = Anchor.Centre,
                                 Origin = Anchor.Centre,

osu.Game/Screens/Ranking/ResultsScreen.cs

@@ -1,6 +1,7 @@
 // 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 System;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
@@ -135,7 +136,7 @@ namespace osu.Game.Screens.Ranking
             protected override void Update()
             {
                 base.Update();
-                content.Height = DrawHeight;
+                content.Height = Math.Max(768, DrawHeight);
             }
         }
     }