From c846bf20a76ffb9adf5c698f64f3c668b04f90aa Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 30 Aug 2022 17:58:32 +0900
Subject: [PATCH] Add background hover and adjust remaining metrics

---
 .../Overlays/Notifications/Notification.cs    | 33 ++++++++++++++-----
 1 file changed, 25 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Overlays/Notifications/Notification.cs b/osu.Game/Overlays/Notifications/Notification.cs
index b04e732f92..a759e2efd1 100644
--- a/osu.Game/Overlays/Notifications/Notification.cs
+++ b/osu.Game/Overlays/Notifications/Notification.cs
@@ -58,6 +58,11 @@ namespace osu.Game.Overlays.Notifications
 
         protected virtual IconUsage CloseButtonIcon => FontAwesome.Solid.Check;
 
+        [Resolved]
+        private OverlayColourProvider colourProvider { get; set; } = null!;
+
+        private Box background = null!;
+
         protected Notification()
         {
             RelativeSizeAxes = Axes.X;
@@ -73,7 +78,7 @@ namespace osu.Game.Overlays.Notifications
                 },
                 MainContent = new Container
                 {
-                    CornerRadius = 8,
+                    CornerRadius = 6,
                     Masking = true,
                     RelativeSizeAxes = Axes.X,
                     AutoSizeAxes = Axes.Y,
@@ -133,9 +138,9 @@ namespace osu.Game.Overlays.Notifications
         }
 
         [BackgroundDependencyLoader]
-        private void load(OverlayColourProvider colourProvider)
+        private void load()
         {
-            MainContent.Add(new Box
+            MainContent.Add(background = new Box
             {
                 RelativeSizeAxes = Axes.Both,
                 Colour = colourProvider.Background3,
@@ -143,6 +148,18 @@ namespace osu.Game.Overlays.Notifications
             });
         }
 
+        protected override bool OnHover(HoverEvent e)
+        {
+            background.FadeColour(colourProvider.Background2, 200, Easing.OutQuint);
+            return base.OnHover(e);
+        }
+
+        protected override void OnHoverLost(HoverLostEvent e)
+        {
+            background.FadeColour(colourProvider.Background3, 200, Easing.OutQuint);
+            base.OnHoverLost(e);
+        }
+
         protected override bool OnClick(ClickEvent e)
         {
             if (Activated?.Invoke() ?? true)
@@ -193,7 +210,7 @@ namespace osu.Game.Overlays.Notifications
             private void load()
             {
                 RelativeSizeAxes = Axes.Y;
-                Width = 24;
+                Width = 28;
 
                 Children = new Drawable[]
                 {
@@ -216,15 +233,15 @@ namespace osu.Game.Overlays.Notifications
 
             protected override bool OnHover(HoverEvent e)
             {
-                background.FadeIn(200);
-                icon.FadeColour(colourProvider.Content1, 200);
+                background.FadeIn(200, Easing.OutQuint);
+                icon.FadeColour(colourProvider.Content1, 200, Easing.OutQuint);
                 return base.OnHover(e);
             }
 
             protected override void OnHoverLost(HoverLostEvent e)
             {
-                background.FadeOut(200);
-                icon.FadeColour(colourProvider.Foreground1, 200);
+                background.FadeOut(200, Easing.OutQuint);
+                icon.FadeColour(colourProvider.Foreground1, 200, Easing.OutQuint);
                 base.OnHoverLost(e);
             }
         }