From 8bd59ff0b3614f1a39e33e8e0309246e7ca6c0b4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 17 Nov 2017 17:40:10 +0900
Subject: [PATCH] Fix osu! logo occasionally being in the wrong state on
 entering the main menu

---
 osu.Game/Screens/Menu/ButtonSystem.cs | 60 +++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)

diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index af16fbd71c..ac597cd9d7 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -55,6 +55,8 @@ namespace osu.Game.Screens.Menu
 
                 // osuLogo.SizeForFlow relies on loading to be complete.
                 buttonFlow.Position = new Vector2(WEDGE_WIDTH * 2 - (BUTTON_WIDTH + this.logo.SizeForFlow / 4), 0);
+
+                updateLogoState();
             }
         }
 
@@ -217,6 +219,8 @@ namespace osu.Game.Screens.Menu
                 if (state == MenuState.TopLevel)
                     buttonArea.FinishTransforms(true);
 
+                updateLogoState(lastState);
+
                 using (buttonArea.BeginDelayedSequence(lastState == MenuState.Initial ? 150 : 0, true))
                 {
                     switch (state)
@@ -320,6 +324,62 @@ namespace osu.Game.Screens.Menu
             }
         }
 
+        private void updateLogoState(MenuState lastState = MenuState.Initial)
+        {
+            switch (state)
+            {
+                case MenuState.Exit:
+                case MenuState.Initial:
+                    trackingPosition = false;
+
+                    logo?.Delay(150)
+                        .Schedule(() =>
+                        {
+                            toolbar?.Hide();
+
+                            logo.ClearTransforms(targetMember: nameof(Position));
+                            logo.RelativePositionAxes = Axes.Both;
+
+                            logo.MoveTo(new Vector2(0.5f), 800, Easing.OutExpo);
+                            logo.ScaleTo(1, 800, Easing.OutExpo);
+                        });
+
+                    break;
+                case MenuState.TopLevel:
+                case MenuState.Play:
+                    logo.ClearTransforms(targetMember: nameof(Position));
+                    logo.RelativePositionAxes = Axes.None;
+
+                    trackingPosition = true;
+
+                    switch (lastState)
+                    {
+                        case MenuState.Initial:
+                            logo.ScaleTo(0.5f, 200, Easing.In);
+
+                            trackingPosition = false;
+
+                            logo
+                                .MoveTo(iconTrackingPosition, lastState == MenuState.EnteringMode ? 0 : 200, Easing.In)
+                                .OnComplete(o =>
+                                {
+                                    trackingPosition = true;
+
+                                    o.Impact();
+                                    toolbar?.Show();
+                                });
+                            break;
+                        default:
+                            logo.ScaleTo(0.5f, 200, Easing.OutQuint);
+                            break;
+                    }
+                    break;
+                case MenuState.EnteringMode:
+                    trackingPosition = true;
+                    break;
+            }
+        }
+
         private Vector2 iconTrackingPosition => logo.Parent.ToLocalSpace(iconFacade.ScreenSpaceDrawQuad.Centre);
 
         private bool trackingPosition;