From 7fdc79dd68f32d13456aaa64994881215cf21b41 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 5 May 2019 20:20:41 +0900
Subject: [PATCH] Improve skip boundary logic to be closer to expectations

Supersedes #4693.
Closes #4676.
---
 osu.Game/Screens/Play/SkipOverlay.cs | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Play/SkipOverlay.cs b/osu.Game/Screens/Play/SkipOverlay.cs
index 738877232d..65cf5e51f3 100644
--- a/osu.Game/Screens/Play/SkipOverlay.cs
+++ b/osu.Game/Screens/Play/SkipOverlay.cs
@@ -38,6 +38,10 @@ namespace osu.Game.Screens.Play
         public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => true;
         protected override bool BlockPositionalInput => false;
 
+        /// <summary>
+        /// Displays a skip overlay, giving the user the ability to skip forward.
+        /// </summary>
+        /// <param name="startTime">The time at which gameplay begins to appear.</param>
         public SkipOverlay(double startTime)
         {
             this.startTime = startTime;
@@ -87,16 +91,21 @@ namespace osu.Game.Screens.Play
             };
         }
 
-        private const double skip_required_cutoff = 3000;
+        /// <summary>
+        /// Duration before gameplay start time required before skip button displays.
+        /// </summary>
+        private const double skip_buffer = 1000;
+
         private const double fade_time = 300;
 
-        private double beginFadeTime => startTime - skip_required_cutoff - fade_time;
+        private double beginFadeTime => startTime - fade_time;
 
         protected override void LoadComplete()
         {
             base.LoadComplete();
 
-            if (startTime < skip_required_cutoff)
+            // skip is not required if there is no extra "empty" time to skip.
+            if (Clock.CurrentTime > beginFadeTime - skip_buffer)
             {
                 Alpha = 0;
                 Expire();
@@ -107,7 +116,7 @@ namespace osu.Game.Screens.Play
             using (BeginAbsoluteSequence(beginFadeTime))
                 this.FadeOut(fade_time);
 
-            button.Action = () => RequestSeek?.Invoke(startTime - skip_required_cutoff - fade_time);
+            button.Action = () => RequestSeek?.Invoke(beginFadeTime);
 
             displayTime = Time.Current;