Second pass of info wedge metrics

Author: peppy

osu.Game/Screens/SelectV2/BeatmapInfoWedge.cs

@@ -1,5 +1,3 @@
-// Copyright (c) ppy Pty Ltd <[email protected]>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
 
 using System;
 using System.Collections.Generic;
@@ -83,9 +81,6 @@ private void load()
             Masking = true;
             CornerRadius = corner_radius;
 
-            // Hide the top edge of the wedge off-screen (so we don't see the corner).
-            Margin = new MarginPadding { Top = -corner_radius };
-
             InternalChildren = new Drawable[]
             {
                 new WedgeBackground(),
@@ -94,28 +89,26 @@ private void load()
                     RelativeSizeAxes = Axes.X,
                     AutoSizeAxes = Axes.Y,
                     Direction = FillDirection.Vertical,
-                    Padding = new MarginPadding { Left = SongSelect.WEDGE_CONTENT_MARGIN },
+                    Padding = new MarginPadding
+                    {
+                        Top = SongSelect.WEDGE_CONTENT_MARGIN,
+                        Left = SongSelect.WEDGE_CONTENT_MARGIN
+                    },
                     Spacing = new Vector2(0f, 4f),
                     Shear = -shear,
                     Children = new Drawable[]
                     {
-                        new ShearAlignedDrawable(shear, new Container
+                        new ShearAlignedDrawable(shear, statusPill = new BeatmapSetOnlineStatusPill
                         {
-                            RelativeSizeAxes = Axes.X,
-                            Height = 35,
-                            Child = statusPill = new BeatmapSetOnlineStatusPill
-                            {
-                                AutoSizeAxes = Axes.Both,
-                                Margin = new MarginPadding { Right = 20f, Top = 20f },
-                                TextSize = OsuFont.Caption.Size,
-                                TextPadding = new MarginPadding { Horizontal = 6, Vertical = 1 },
-                            }
+                            ShowUnknownStatus = true,
+                            TextSize = OsuFont.Caption.Size,
+                            TextPadding = new MarginPadding { Horizontal = 6, Vertical = 1 },
                         }),
                         new ShearAlignedDrawable(shear, titleContainer = new Container
                         {
                             RelativeSizeAxes = Axes.X,
-                            Height = OsuFont.Title.Size + 2,
-                            Margin = new MarginPadding { Bottom = -5f },
+                            Height = OsuFont.Title.Size,
+                            Margin = new MarginPadding { Bottom = -4f },
                             Child = titleLink = new OsuHoverContainer
                             {
                                 AutoSizeAxes = Axes.Both,

osu.Game/Screens/SelectV2/BeatmapWedgesTabControl.cs

@@ -108,12 +108,10 @@ protected override bool OnHover(HoverEvent e)
 
             private void updateDisplay()
             {
-                if (Active.Value)
+                if (Active.Value || IsHovered)
                     Text.FadeColour(colourProvider.Content1, 300, Easing.OutQuint);
-                else if (IsHovered)
-                    Text.FadeColour(colourProvider.Content2, 300, Easing.OutQuint);
                 else
-                    Text.FadeColour(colourProvider.Foreground1, 300, Easing.OutQuint);
+                    Text.FadeColour(colourProvider.Content2, 300, Easing.OutQuint);
 
                 Text.Font = Text.Font.With(weight: Active.Value ? FontWeight.SemiBold : FontWeight.Regular);
             }

osu.Game/Screens/SelectV2/SongSelect.cs

@@ -33,9 +33,9 @@ public abstract partial class SongSelect : ScreenWithBeatmapBackground
     {
         private const float logo_scale = 0.4f;
 
-        public const float WEDGE_CONTENT_MARGIN = corner_radius_hide_offset + OsuGame.SCREEN_EDGE_MARGIN;
+        public const float WEDGE_CONTENT_MARGIN = CORNER_RADIUS_HIDE_OFFSET + OsuGame.SCREEN_EDGE_MARGIN;
 
-        private const float corner_radius_hide_offset = 20f;
+        public const float CORNER_RADIUS_HIDE_OFFSET = 20f;
 
         public const double ENTER_DURATION = 600;
 
@@ -109,7 +109,11 @@ private void load()
                                         wedgesContainer = new FillFlowContainer
                                         {
                                             RelativeSizeAxes = Axes.Both,
-                                            Margin = new MarginPadding { Left = -corner_radius_hide_offset },
+                                            Margin = new MarginPadding
+                                            {
+                                                Top = -CORNER_RADIUS_HIDE_OFFSET,
+                                                Left = -CORNER_RADIUS_HIDE_OFFSET
+                                            },
                                             Spacing = new Vector2(0f, 4f),
                                             Direction = FillDirection.Vertical,
                                             Children = new Drawable[]