From 363e7a6f537b7feda0f8825192391d64e791a749 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 19 May 2022 16:42:43 +0900
Subject: [PATCH] Simplify toolbar hiding logic in `FirstRunSetupOverlay`

Rather than fiddling around with the activation modes, this seems like a
much cleaner way to make things work.

Closes https://github.com/ppy/osu/issues/18277.
---
 osu.Game/Overlays/FirstRunSetupOverlay.cs | 22 +++-------------------
 osu.Game/Screens/Menu/MainMenu.cs         |  2 ++
 2 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/osu.Game/Overlays/FirstRunSetupOverlay.cs b/osu.Game/Overlays/FirstRunSetupOverlay.cs
index 890f17b013..7b0de4affe 100644
--- a/osu.Game/Overlays/FirstRunSetupOverlay.cs
+++ b/osu.Game/Overlays/FirstRunSetupOverlay.cs
@@ -62,8 +62,6 @@ namespace osu.Game.Overlays
 
         private Container screenContent = null!;
 
-        private Bindable<OverlayActivation>? overlayActivationMode;
-
         private Container content = null!;
 
         private LoadingSpinner loading = null!;
@@ -225,16 +223,9 @@ namespace osu.Game.Overlays
             // if we are valid for display, only do so after reaching the main menu.
             performer.PerformFromScreen(screen =>
             {
-                MainMenu menu = (MainMenu)screen;
-
-                // Eventually I'd like to replace this with a better method that doesn't access the screen.
-                // Either this dialog would be converted to its own screen, or at very least be "hosted" by a screen pushed to the main menu.
-                // Alternatively, another method of disabling notifications could be added to `INotificationOverlay`.
-                if (menu != null)
-                {
-                    overlayActivationMode = menu.OverlayActivationMode.GetBoundCopy();
-                    overlayActivationMode.Value = OverlayActivation.UserTriggered;
-                }
+                // Hides the toolbar for us.
+                if (screen is MainMenu menu)
+                    menu.ReturnToOsuLogo();
 
                 base.Show();
             }, new[] { typeof(MainMenu) });
@@ -257,13 +248,6 @@ namespace osu.Game.Overlays
 
             content.ScaleTo(0.99f, 400, Easing.OutQuint);
 
-            if (overlayActivationMode != null)
-            {
-                // If this is non-null we are guaranteed to have come from the main menu.
-                overlayActivationMode.Value = OverlayActivation.All;
-                overlayActivationMode = null;
-            }
-
             if (currentStepIndex != null)
             {
                 notificationOverlay.Post(new SimpleNotification
diff --git a/osu.Game/Screens/Menu/MainMenu.cs b/osu.Game/Screens/Menu/MainMenu.cs
index 4401ee93ec..6fc8039413 100644
--- a/osu.Game/Screens/Menu/MainMenu.cs
+++ b/osu.Game/Screens/Menu/MainMenu.cs
@@ -150,6 +150,8 @@ namespace osu.Game.Screens.Menu
         [Resolved(canBeNull: true)]
         private IPerformFromScreenRunner performer { get; set; }
 
+        public void ReturnToOsuLogo() => Buttons.State = ButtonSystemState.Initial;
+
         private void confirmAndExit()
         {
             if (exitConfirmed) return;