From c32168c61f2d358ca88173a9f74bdccafbf699ab Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 25 Aug 2021 17:03:33 +0300
Subject: [PATCH 1/2] Add failing test case

---
 .../Editing/TestSceneEditorScreenModes.cs     | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 osu.Game.Tests/Visual/Editing/TestSceneEditorScreenModes.cs

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorScreenModes.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorScreenModes.cs
new file mode 100644
index 0000000000..98d8a41674
--- /dev/null
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorScreenModes.cs
@@ -0,0 +1,29 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Linq;
+using NUnit.Framework;
+using osu.Framework.Testing;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Osu;
+using osu.Game.Screens.Edit;
+using osu.Game.Screens.Edit.Components.Menus;
+
+namespace osu.Game.Tests.Visual.Editing
+{
+    public class TestSceneEditorScreenModes : EditorTestScene
+    {
+        protected override Ruleset CreateEditorRuleset() => new OsuRuleset();
+
+        [Test]
+        public void TestSwitchScreensInstantaneously()
+        {
+            AddStep("switch between all screens at once", () =>
+            {
+                foreach (var screen in Enum.GetValues(typeof(EditorScreenMode)).Cast<EditorScreenMode>())
+                    Editor.ChildrenOfType<EditorMenuBar>().Single().Mode.Value = screen;
+            });
+        }
+    }
+}

From 3ad0b529fbdeff6297f6a0ba8be73255a32bd895 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Wed, 25 Aug 2021 16:58:06 +0300
Subject: [PATCH 2/2] Make `EditorScreen` inherit from `VisibilityContainer`
 rather than unsafe transforms

---
 osu.Game/Screens/Edit/Editor.cs       | 12 +++++-------
 osu.Game/Screens/Edit/EditorScreen.cs | 15 +++++++++------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index e8d919311b..57c78f3c65 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -605,19 +605,14 @@ namespace osu.Game.Screens.Edit
         {
             var lastScreen = currentScreen;
 
-            lastScreen?
-                .ScaleTo(0.98f, 200, Easing.OutQuint)
-                .FadeOut(200, Easing.OutQuint);
+            lastScreen?.Hide();
 
             try
             {
                 if ((currentScreen = screenContainer.SingleOrDefault(s => s.Type == e.NewValue)) != null)
                 {
                     screenContainer.ChangeChildDepth(currentScreen, lastScreen?.Depth + 1 ?? 0);
-
-                    currentScreen
-                        .ScaleTo(1, 200, Easing.OutQuint)
-                        .FadeIn(200, Easing.OutQuint);
+                    currentScreen.Show();
                     return;
                 }
 
@@ -650,7 +645,10 @@ namespace osu.Game.Screens.Edit
                 LoadComponentAsync(currentScreen, newScreen =>
                 {
                     if (newScreen == currentScreen)
+                    {
                         screenContainer.Add(newScreen);
+                        newScreen.Show();
+                    }
                 });
             }
             finally
diff --git a/osu.Game/Screens/Edit/EditorScreen.cs b/osu.Game/Screens/Edit/EditorScreen.cs
index 7fbb6a8ca0..d7fe5207d0 100644
--- a/osu.Game/Screens/Edit/EditorScreen.cs
+++ b/osu.Game/Screens/Edit/EditorScreen.cs
@@ -10,7 +10,7 @@ namespace osu.Game.Screens.Edit
     /// <summary>
     /// TODO: eventually make this inherit Screen and add a local screen stack inside the Editor.
     /// </summary>
-    public abstract class EditorScreen : Container
+    public abstract class EditorScreen : VisibilityContainer
     {
         [Resolved]
         protected EditorBeatmap EditorBeatmap { get; private set; }
@@ -31,13 +31,16 @@ namespace osu.Game.Screens.Edit
             InternalChild = content = new Container { RelativeSizeAxes = Axes.Both };
         }
 
-        protected override void LoadComplete()
+        protected override void PopIn()
         {
-            base.LoadComplete();
+            this.ScaleTo(1f, 200, Easing.OutQuint)
+                .FadeIn(200, Easing.OutQuint);
+        }
 
-            this.FadeTo(0)
-                .Then()
-                .FadeTo(1f, 250, Easing.OutQuint);
+        protected override void PopOut()
+        {
+            this.ScaleTo(0.98f, 200, Easing.OutQuint)
+                .FadeOut(200, Easing.OutQuint);
         }
     }
 }