From 8b58475ee04dcbd1ffd59b11736a7c79197df2be Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 4 Nov 2022 18:50:42 +0900
Subject: [PATCH] Update `OsuButton` hover animation to better suit immediacy
 of sound effects

---
 osu.Game/Graphics/UserInterface/OsuButton.cs | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/OsuButton.cs b/osu.Game/Graphics/UserInterface/OsuButton.cs
index 88f3ccd191..9140815f32 100644
--- a/osu.Game/Graphics/UserInterface/OsuButton.cs
+++ b/osu.Game/Graphics/UserInterface/OsuButton.cs
@@ -4,7 +4,6 @@
 #nullable disable
 
 using osu.Framework.Allocation;
-using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
@@ -95,7 +94,7 @@ namespace osu.Game.Graphics.UserInterface
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
                         RelativeSizeAxes = Axes.Both,
-                        Colour = Color4.White.Opacity(.1f),
+                        Colour = Color4.White,
                         Blending = BlendingParameters.Additive,
                         Depth = float.MinValue
                     },
@@ -126,7 +125,7 @@ namespace osu.Game.Graphics.UserInterface
         protected override bool OnClick(ClickEvent e)
         {
             if (Enabled.Value)
-                Background.FlashColour(BackgroundColour.Lighten(0.4f), 200);
+                Background.FlashColour(Color4.White, 800, Easing.OutQuint);
 
             return base.OnClick(e);
         }
@@ -134,7 +133,11 @@ namespace osu.Game.Graphics.UserInterface
         protected override bool OnHover(HoverEvent e)
         {
             if (Enabled.Value)
-                Hover.FadeIn(200, Easing.OutQuint);
+            {
+                Hover.FadeTo(0.2f, 40, Easing.OutQuint)
+                     .Then()
+                     .FadeTo(0.1f, 800, Easing.OutQuint);
+            }
 
             return base.OnHover(e);
         }
@@ -143,7 +146,7 @@ namespace osu.Game.Graphics.UserInterface
         {
             base.OnHoverLost(e);
 
-            Hover.FadeOut(300);
+            Hover.FadeOut(800, Easing.OutQuint);
         }
 
         protected override bool OnMouseDown(MouseDownEvent e)