From 53c1bc666cde003e07fd396d49a0b75ec77358f8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 6 Apr 2021 15:05:34 +0900
Subject: [PATCH] Make addition of nested GlobalActionContainer in
 OsuGameTestScene optional

---
 .../Visual/Navigation/OsuGameTestScene.cs     |  2 ++
 .../Visual/OsuManualInputManagerTestScene.cs  | 19 ++++++++++++++++---
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs b/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs
index bf5338d81a..f9a991f756 100644
--- a/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs
+++ b/osu.Game.Tests/Visual/Navigation/OsuGameTestScene.cs
@@ -36,6 +36,8 @@ namespace osu.Game.Tests.Visual.Navigation
 
         protected override bool UseFreshStoragePerRun => true;
 
+        protected override bool CreateNestedActionContainer => false;
+
         [BackgroundDependencyLoader]
         private void load(GameHost host)
         {
diff --git a/osu.Game/Tests/Visual/OsuManualInputManagerTestScene.cs b/osu.Game/Tests/Visual/OsuManualInputManagerTestScene.cs
index b3073c8bea..7dad636da7 100644
--- a/osu.Game/Tests/Visual/OsuManualInputManagerTestScene.cs
+++ b/osu.Game/Tests/Visual/OsuManualInputManagerTestScene.cs
@@ -24,18 +24,31 @@ namespace osu.Game.Tests.Visual
         private readonly TriangleButton buttonTest;
         private readonly TriangleButton buttonLocal;
 
+        /// <summary>
+        /// Whether to create a nested container to handle <see cref="GlobalAction"/>s that result from local (manual) test input.
+        /// This should be disabled when instantiating an <see cref="OsuGame"/> instance else actions will be lost.
+        /// </summary>
+        protected virtual bool CreateNestedActionContainer => true;
+
         protected OsuManualInputManagerTestScene()
         {
             MenuCursorContainer cursorContainer;
 
+            CompositeDrawable mainContent =
+                (cursorContainer = new MenuCursorContainer { RelativeSizeAxes = Axes.Both })
+                .WithChild(content = new OsuTooltipContainer(cursorContainer.Cursor) { RelativeSizeAxes = Axes.Both });
+
+            if (CreateNestedActionContainer)
+            {
+                mainContent = new GlobalActionContainer(null, null).WithChild(mainContent);
+            }
+
             base.Content.AddRange(new Drawable[]
             {
                 InputManager = new ManualInputManager
                 {
                     UseParentInput = true,
-                    Child = new GlobalActionContainer(null, null)
-                        .WithChild((cursorContainer = new MenuCursorContainer { RelativeSizeAxes = Axes.Both })
-                            .WithChild(content = new OsuTooltipContainer(cursorContainer.Cursor) { RelativeSizeAxes = Axes.Both }))
+                    Child = mainContent
                 },
                 new Container
                 {