From 7b770d03c5b99a83434e636dc37ae08f71abb41b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 22 May 2018 16:26:11 +0900
Subject: [PATCH] Use OnMouseMove instead of Update logic

---
 osu.Game/Screens/Play/HUD/QuitButton.cs | 47 ++++++++++++++++---------
 1 file changed, 31 insertions(+), 16 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/QuitButton.cs b/osu.Game/Screens/Play/HUD/QuitButton.cs
index 9f59d4164f..8c59427edb 100644
--- a/osu.Game/Screens/Play/HUD/QuitButton.cs
+++ b/osu.Game/Screens/Play/HUD/QuitButton.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Screens.Play.HUD
 {
     public class QuitButton : FillFlowContainer
     {
-        public override bool ReceiveMouseInputAt(Vector2 screenSpacePos) => button.ReceiveMouseInputAt(screenSpacePos);
+        public override bool ReceiveMouseInputAt(Vector2 screenSpacePos) => true;
 
         private readonly Button button;
 
@@ -43,7 +43,11 @@ namespace osu.Game.Screens.Play.HUD
                     Anchor = Anchor.CentreLeft,
                     Origin = Anchor.CentreLeft
                 },
-                button = new Button()
+                button = new Button
+                {
+                    HoverGained = () => text.FadeIn(500, Easing.OutQuint),
+                    HoverLost = () => text.FadeOut(500, Easing.OutQuint)
+                }
             };
             AutoSizeAxes = Axes.Both;
         }
@@ -54,28 +58,24 @@ namespace osu.Game.Screens.Play.HUD
             base.LoadComplete();
         }
 
-        protected override bool OnHover(InputState state)
-        {
-            text.FadeIn(500, Easing.OutQuint);
-            return true;
-        }
+        private float positionalAdjust;
 
-        protected override void OnHoverLost(InputState state)
+        protected override bool OnMouseMove(InputState state)
         {
-            text.FadeOut(500, Easing.OutQuint);
-            base.OnHoverLost(state);
+            positionalAdjust = Vector2.Distance(state.Mouse.NativeState.Position, button.ScreenSpaceDrawQuad.Centre) / 200;
+            return base.OnMouseMove(state);
         }
 
         protected override void Update()
         {
             base.Update();
 
-            float adjust = Vector2.Distance(GetContainingInputManager().CurrentState.Mouse.NativeState.Position, button.ScreenSpaceDrawQuad.Centre) / 200;
-            double elapsed = MathHelper.Clamp(Clock.ElapsedFrameTime, 0, 1000);
-
-            bool stayVisible = text.Alpha > 0 || button.Progress.Value > 0 || IsHovered;
-
-            Alpha = stayVisible ? 1 : Interpolation.ValueAt(elapsed, Alpha, MathHelper.Clamp(1 - adjust, 0.04f, 1), 0, 200, Easing.OutQuint);
+            if (text.Alpha > 0 || button.Progress.Value > 0 || button.IsHovered)
+                Alpha = 1;
+            else
+                Alpha = Interpolation.ValueAt(
+                    MathHelper.Clamp(Clock.ElapsedFrameTime, 0, 1000),
+                    Alpha, MathHelper.Clamp(1 - positionalAdjust, 0.04f, 1), 0, 200, Easing.OutQuint);
         }
 
         private class Button : HoldToConfirmContainer
@@ -86,6 +86,9 @@ namespace osu.Game.Screens.Play.HUD
 
             protected override bool AllowMultipleFires => true;
 
+            public Action HoverGained;
+            public Action HoverLost;
+
             [BackgroundDependencyLoader]
             private void load(OsuColour colours)
             {
@@ -163,6 +166,18 @@ namespace osu.Game.Screens.Play.HUD
                              }));
             }
 
+            protected override bool OnHover(InputState state)
+            {
+                HoverGained?.Invoke();
+                return true;
+            }
+
+            protected override void OnHoverLost(InputState state)
+            {
+                HoverLost?.Invoke();
+                base.OnHoverLost(state);
+            }
+
             protected override bool OnMouseDown(InputState state, MouseDownEventArgs args)
             {
                 if (!pendingAnimation && state.Mouse.Buttons.Count == 1)