From f60a80b2635f4beb8d45f5a8432abbb2bf36e278 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 22 Jun 2020 18:01:08 +0900
Subject: [PATCH] Fix animations and general code quality

---
 osu.Game/Screens/Menu/IntroWelcome.cs | 73 +++++++++++----------------
 1 file changed, 29 insertions(+), 44 deletions(-)

diff --git a/osu.Game/Screens/Menu/IntroWelcome.cs b/osu.Game/Screens/Menu/IntroWelcome.cs
index 92c844db8b..7714ec6ee1 100644
--- a/osu.Game/Screens/Menu/IntroWelcome.cs
+++ b/osu.Game/Screens/Menu/IntroWelcome.cs
@@ -69,63 +69,47 @@ public override void OnSuspending(IScreen next)
         private class WelcomeIntroSequence : Container
         {
             private Sprite welcomeText;
+            private Container scaleContainer;
 
             [BackgroundDependencyLoader]
             private void load(TextureStore textures)
             {
                 Origin = Anchor.Centre;
                 Anchor = Anchor.Centre;
+
                 Children = new Drawable[]
                 {
-                    new Container
+                    scaleContainer = new Container
                     {
+                        AutoSizeAxes = Axes.Both,
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
-                        AutoSizeAxes = Axes.Both,
                         Children = new Drawable[]
                         {
-                            new Container
+                            new LogoVisualisation
                             {
-                                AutoSizeAxes = Axes.Both,
-                                Children = new Drawable[]
-                                {
-                                    new LogoVisualisation
-                                    {
-                                        RelativeSizeAxes = Axes.Both,
-                                        Anchor = Anchor.Centre,
-                                        Origin = Anchor.Centre,
-                                        Alpha = 0.5f,
-                                        AccentColour = Color4.DarkBlue,
-                                        Size = new Vector2(0.96f)
-                                    },
-                                    new Container
-                                    {
-                                        AutoSizeAxes = Axes.Both,
-                                        Children = new Drawable[]
-                                        {
-                                            new Circle
-                                            {
-                                                Anchor = Anchor.Centre,
-                                                Origin = Anchor.Centre,
-                                                Size = new Vector2(480),
-                                                Colour = Color4.Black
-                                            }
-                                        }
-                                    }
-                                }
-                            }
+                                RelativeSizeAxes = Axes.Both,
+                                Anchor = Anchor.Centre,
+                                Origin = Anchor.Centre,
+                                Alpha = 0.5f,
+                                AccentColour = Color4.DarkBlue,
+                                Size = new Vector2(0.96f)
+                            },
+                            new Circle
+                            {
+                                Anchor = Anchor.Centre,
+                                Origin = Anchor.Centre,
+                                Size = new Vector2(480),
+                                Colour = Color4.Black
+                            },
+                            welcomeText = new Sprite
+                            {
+                                Anchor = Anchor.Centre,
+                                Origin = Anchor.Centre,
+                                Texture = textures.Get(@"Intro/Welcome/welcome_text")
+                            },
                         }
                     },
-                    welcomeText = new Sprite
-                    {
-                        Anchor = Anchor.Centre,
-                        Origin = Anchor.Centre,
-                        RelativeSizeAxes = Axes.X,
-                        Scale = new Vector2(0.1f),
-                        Height = 156,
-                        Alpha = 0,
-                        Texture = textures.Get(@"Intro/Welcome/welcome_text")
-                    },
                 };
             }
 
@@ -135,9 +119,10 @@ protected override void LoadComplete()
 
                 using (BeginDelayedSequence(0, true))
                 {
-                    welcomeText.ResizeHeightTo(welcomeText.Height * 2, 500, Easing.In);
-                    welcomeText.FadeIn(delay_step_two);
-                    welcomeText.ScaleTo(welcomeText.Scale + new Vector2(0.1f), delay_step_two, Easing.Out).OnComplete(_ => Expire());
+                    scaleContainer.ScaleTo(0.9f).ScaleTo(1, delay_step_two).OnComplete(_ => Expire());
+                    scaleContainer.FadeInFromZero(1800);
+
+                    welcomeText.ScaleTo(new Vector2(1, 0)).ScaleTo(Vector2.One, 400, Easing.Out);
                 }
             }
         }