From 2efe82a18db9c46d2502852201fea28dfb114e73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sat, 28 Aug 2021 20:20:42 +0200
Subject: [PATCH] Remove popover container from manual input manager test scene

---
 .../TestSceneLabelledColourPalette.cs         | 21 ++++++++++++-------
 .../Visual/OsuManualInputManagerTestScene.cs  |  7 +------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneLabelledColourPalette.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneLabelledColourPalette.cs
index 6fafb8f87a..e1ea02ba67 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneLabelledColourPalette.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneLabelledColourPalette.cs
@@ -5,6 +5,7 @@ using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Cursor;
 using osu.Framework.Testing;
 using osu.Framework.Utils;
 using osu.Game.Graphics.Cursor;
@@ -55,20 +56,24 @@ namespace osu.Game.Tests.Visual.UserInterface
         {
             AddStep("create component", () =>
             {
-                Child = new OsuContextMenuContainer
+                Child = new PopoverContainer
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Child = new Container
+                    Child = new OsuContextMenuContainer
                     {
-                        Anchor = Anchor.Centre,
-                        Origin = Anchor.Centre,
-                        Width = 500,
-                        AutoSizeAxes = Axes.Y,
-                        Child = component = new LabelledColourPalette
+                        RelativeSizeAxes = Axes.Both,
+                        Child = new Container
                         {
                             Anchor = Anchor.Centre,
                             Origin = Anchor.Centre,
-                            ColourNamePrefix = "My colour #"
+                            Width = 500,
+                            AutoSizeAxes = Axes.Y,
+                            Child = component = new LabelledColourPalette
+                            {
+                                Anchor = Anchor.Centre,
+                                Origin = Anchor.Centre,
+                                ColourNamePrefix = "My colour #"
+                            }
                         }
                     }
                 };
diff --git a/osu.Game/Tests/Visual/OsuManualInputManagerTestScene.cs b/osu.Game/Tests/Visual/OsuManualInputManagerTestScene.cs
index c5e2e67eaf..752794d25a 100644
--- a/osu.Game/Tests/Visual/OsuManualInputManagerTestScene.cs
+++ b/osu.Game/Tests/Visual/OsuManualInputManagerTestScene.cs
@@ -3,7 +3,6 @@
 
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Testing.Input;
 using osu.Game.Graphics.Cursor;
@@ -35,11 +34,7 @@ namespace osu.Game.Tests.Visual
         {
             MenuCursorContainer cursorContainer;
 
-            CompositeDrawable mainContent = new PopoverContainer
-            {
-                RelativeSizeAxes = Axes.Both,
-                Child = cursorContainer = new MenuCursorContainer { RelativeSizeAxes = Axes.Both, }
-            };
+            CompositeDrawable mainContent = cursorContainer = new MenuCursorContainer { RelativeSizeAxes = Axes.Both };
 
             cursorContainer.Child = content = new OsuTooltipContainer(cursorContainer.Cursor)
             {