From ccb27082d52c2bda1bfd01e4a5ca3583e49c3035 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 24 Jun 2020 11:08:32 +0900
Subject: [PATCH] Fix background appearing too late

---
 osu.Game/Screens/Menu/IntroWelcome.cs | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Menu/IntroWelcome.cs b/osu.Game/Screens/Menu/IntroWelcome.cs
index 81e473dc04..abd4a68d4f 100644
--- a/osu.Game/Screens/Menu/IntroWelcome.cs
+++ b/osu.Game/Screens/Menu/IntroWelcome.cs
@@ -11,6 +11,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
+using osu.Game.Screens.Backgrounds;
 using osuTK.Graphics;
 
 namespace osu.Game.Screens.Menu
@@ -24,6 +25,13 @@ namespace osu.Game.Screens.Menu
         private SampleChannel pianoReverb;
         protected override string SeeyaSampleName => "Intro/Welcome/seeya";
 
+        protected override BackgroundScreen CreateBackground() => background = new BackgroundScreenDefault(false)
+        {
+            Alpha = 0,
+        };
+
+        private BackgroundScreenDefault background;
+
         [BackgroundDependencyLoader]
         private void load(AudioManager audio)
         {
@@ -44,6 +52,8 @@ namespace osu.Game.Screens.Menu
                     RelativeSizeAxes = Axes.Both
                 }, intro =>
                 {
+                    PrepareMenuLoad();
+
                     intro.LogoVisualisation.AddAmplitudeSource(pianoReverb);
 
                     AddInternal(intro);
@@ -54,21 +64,24 @@ namespace osu.Game.Screens.Menu
                     Scheduler.AddDelayed(() =>
                     {
                         StartTrack();
-                        PrepareMenuLoad();
+
+                        const float fade_in_time = 200;
 
                         logo.ScaleTo(1);
-                        logo.FadeIn();
+                        logo.FadeIn(fade_in_time);
 
-                        Scheduler.Add(LoadMenu);
+                        background.FadeIn(fade_in_time);
+
+                        LoadMenu();
                     }, delay_step_two);
                 });
             }
         }
 
-        public override void OnSuspending(IScreen next)
+        public override void OnResuming(IScreen last)
         {
-            this.FadeOut(300);
-            base.OnSuspending(next);
+            base.OnResuming(last);
+            background.FadeOut(100);
         }
 
         private class WelcomeIntroSequence : Container