From 38d9a46ffb854f1540177d636a1c1a2e8a824166 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Fri, 21 Feb 2020 16:20:17 +0900 Subject: [PATCH 1/4] Add test for relative sizing scenarios --- .../UserInterface/TestSceneLoadingLayer.cs | 24 +++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneLoadingLayer.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneLoadingLayer.cs index 4636c74ca9..7e9654715b 100644 --- a/osu.Game.Tests/Visual/UserInterface/TestSceneLoadingLayer.cs +++ b/osu.Game.Tests/Visual/UserInterface/TestSceneLoadingLayer.cs @@ -21,12 +21,14 @@ namespace osu.Game.Tests.Visual.UserInterface public override IReadOnlyList RequiredTypes => new[] { typeof(LoadingSpinner) }; + private Container content; + [SetUp] public void SetUp() => Schedule(() => { Children = new[] { - new Container + content = new Container { Size = new Vector2(300), Anchor = Anchor.Centre, @@ -60,7 +62,7 @@ namespace osu.Game.Tests.Visual.UserInterface }); [Test] - public void ShowHide() + public void TestShowHide() { AddAssert("not visible", () => !overlay.IsPresent); @@ -74,7 +76,7 @@ namespace osu.Game.Tests.Visual.UserInterface } [Test] - public void ContentRestoreOnDispose() + public void TestContentRestoreOnDispose() { AddAssert("not visible", () => !overlay.IsPresent); @@ -82,9 +84,23 @@ namespace osu.Game.Tests.Visual.UserInterface AddUntilStep("wait for content dim", () => dimContent.Colour != Color4.White); - AddStep("hide", () => overlay.Expire()); + AddStep("expire", () => overlay.Expire()); AddUntilStep("wait for content restore", () => dimContent.Colour == Color4.White); } + + [Test] + public void TestLargeArea() + { + AddStep("show", () => + { + content.RelativeSizeAxes = Axes.Both; + content.Size = new Vector2(1); + + overlay.Show(); + }); + + AddStep("hide", () => overlay.Hide()); + } } } From bbac95958cc26ff36f6772cc3cb02bc79a066eec Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Fri, 21 Feb 2020 16:20:55 +0900 Subject: [PATCH 2/4] Fix incorrect test scene name --- ...estSceneLoadingAnimation.cs => TestSceneLoadingSpinner.cs} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename osu.Game.Tests/Visual/UserInterface/{TestSceneLoadingAnimation.cs => TestSceneLoadingSpinner.cs} (93%) diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneLoadingAnimation.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneLoadingSpinner.cs similarity index 93% rename from osu.Game.Tests/Visual/UserInterface/TestSceneLoadingAnimation.cs rename to osu.Game.Tests/Visual/UserInterface/TestSceneLoadingSpinner.cs index cdb20b9935..45d846a825 100644 --- a/osu.Game.Tests/Visual/UserInterface/TestSceneLoadingAnimation.cs +++ b/osu.Game.Tests/Visual/UserInterface/TestSceneLoadingSpinner.cs @@ -8,9 +8,9 @@ using osuTK.Graphics; namespace osu.Game.Tests.Visual.UserInterface { - public class TestSceneLoadingAnimation : OsuGridTestScene + public class TestSceneLoadingSpinner : OsuGridTestScene { - public TestSceneLoadingAnimation() + public TestSceneLoadingSpinner() : base(2, 2) { LoadingSpinner loading; From 7d145a74704d61a1a44360cac41cd20be0180495 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Fri, 21 Feb 2020 16:21:44 +0900 Subject: [PATCH 3/4] Add test for loading spinner with box --- osu.Game.Tests/Visual/UserInterface/TestSceneLoadingSpinner.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneLoadingSpinner.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneLoadingSpinner.cs index 45d846a825..47f5bdfe17 100644 --- a/osu.Game.Tests/Visual/UserInterface/TestSceneLoadingSpinner.cs +++ b/osu.Game.Tests/Visual/UserInterface/TestSceneLoadingSpinner.cs @@ -34,7 +34,7 @@ namespace osu.Game.Tests.Visual.UserInterface Colour = Color4.White, RelativeSizeAxes = Axes.Both }, - loading = new LoadingSpinner() + loading = new LoadingSpinner(true) }); loading.Show(); From e7ac37715f0d1ca9f16f271558811ccd2ee187f8 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Fri, 21 Feb 2020 16:31:16 +0900 Subject: [PATCH 4/4] Don't handle non-positional input --- osu.Game/Graphics/UserInterface/LoadingLayer.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/osu.Game/Graphics/UserInterface/LoadingLayer.cs b/osu.Game/Graphics/UserInterface/LoadingLayer.cs index 4fdc95f483..25a62acaba 100644 --- a/osu.Game/Graphics/UserInterface/LoadingLayer.cs +++ b/osu.Game/Graphics/UserInterface/LoadingLayer.cs @@ -35,6 +35,8 @@ namespace osu.Game.Graphics.UserInterface MainContents.RelativeSizeAxes = Axes.None; } + public override bool HandleNonPositionalInput => false; + protected override bool Handle(UIEvent e) { switch (e)