From c78c5195f352dcb5bc657cf0e29f66cf61e6a369 Mon Sep 17 00:00:00 2001
From: TocoToucan <TocoToucanMS@gmail.com>
Date: Sat, 28 Apr 2018 20:43:41 +0300
Subject: [PATCH] HoldToQuitButton cleanup

---
 osu.Game/Screens/Play/HUD/HoldToQuit.cs | 38 ++++---------------------
 1 file changed, 6 insertions(+), 32 deletions(-)

diff --git a/osu.Game/Screens/Play/HUD/HoldToQuit.cs b/osu.Game/Screens/Play/HUD/HoldToQuit.cs
index 3f14582d50..59338f8cdc 100644
--- a/osu.Game/Screens/Play/HUD/HoldToQuit.cs
+++ b/osu.Game/Screens/Play/HUD/HoldToQuit.cs
@@ -8,8 +8,6 @@
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input;
-using osu.Framework.Threading;
-using osu.Framework.Timing;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using OpenTK;
@@ -46,20 +44,12 @@ public class HoldToQuitButton : CircularContainer
             private CircularProgress progress;
 
             public Action ExitAction { get; set; }
-            private ScheduledDelegate scheduledExitAction;
-
-            private readonly Scheduler scheduler;
-            private readonly StopwatchClock stopwatchClock;
 
             private const int fade_duration = 200;
+            private const int progress_duration = 1000;
             private const int text_display_time = 5000;
 
-            public HoldToQuitButton(OsuSpriteText text)
-            {
-                this.text = text;
-                scheduler = new Scheduler();
-                stopwatchClock = new StopwatchClock();
-            }
+            public HoldToQuitButton(OsuSpriteText text) => this.text = text;
 
             [BackgroundDependencyLoader]
             private void load(OsuColour colours)
@@ -83,15 +73,14 @@ private void load(OsuColour colours)
                     },
                     progress = new CircularProgress { RelativeSizeAxes = Axes.Both, InnerRadius = 0.1f }
                 });
-                scheduler.AddDelayed(() => text.FadeOut(fade_duration), text_display_time);
+                Scheduler.AddDelayed(() => text.FadeOut(fade_duration), text_display_time);
             }
 
             protected override bool OnMouseDown(InputState state, MouseDownEventArgs args)
             {
                 icon.ScaleTo(1.5f);
                 text.FadeIn(fade_duration);
-                stopwatchClock.Restart();
-                scheduledExitAction = scheduler.AddDelayed(ExitAction, 1000);
+                progress.FillTo(1, progress_duration).OnComplete(cp => ExitAction());
 
                 return base.OnMouseDown(state, args);
             }
@@ -99,26 +88,11 @@ protected override bool OnMouseDown(InputState state, MouseDownEventArgs args)
             protected override bool OnMouseUp(InputState state, MouseUpEventArgs args)
             {
                 icon.ScaleTo(1f);
-                scheduler.AddDelayed(() => text.FadeOut(fade_duration), text_display_time);
-                stopwatchClock.Stop();
-                if (scheduledExitAction != null && !scheduledExitAction.Completed)
-                    scheduledExitAction.Cancel();
-                progress.Current.SetDefault();
+                Scheduler.AddDelayed(() => text.FadeOut(fade_duration), text_display_time);
+                progress.FillTo(0, progress_duration / 4).OnComplete(cp => progress.Current.SetDefault());
 
                 return base.OnMouseUp(state, args);
             }
-
-            protected override void Update()
-            {
-                scheduler.Update();
-                if (stopwatchClock.IsRunning)
-                {
-                    var clampedTime = MathHelper.Clamp(stopwatchClock.CurrentTime, 0, 1000);
-                    progress.Current.Value = clampedTime / 1000;
-                }
-
-                base.Update();
-            }
         }
     }
 }