Merge branch 'master' into fix-right-mouse-drag-large-view

osu.Game.Tournament.Tests/Components/TestSceneDrawableTournamentMatch.cs

@@ -5,14 +5,13 @@ using System;
 using System.Collections.Generic;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Game.Tests.Visual;
 using osu.Game.Tournament.Components;
 using osu.Game.Tournament.Models;
 using osu.Game.Tournament.Screens.Ladder.Components;
 
 namespace osu.Game.Tournament.Tests.Components
 {
-    public class TestSceneDrawableTournamentMatch : OsuTestScene
+    public class TestSceneDrawableTournamentMatch : TournamentTestScene
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
         {

osu.Game.Tournament.Tests/LadderTestScene.cs

@@ -1,13 +1,14 @@
 // 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 NUnit.Framework;
 using osu.Framework.Allocation;
-using osu.Game.Tests.Visual;
 using osu.Game.Tournament.Models;
 
 namespace osu.Game.Tournament.Tests
 {
-    public abstract class LadderTestScene : OsuTestScene
+    [TestFixture]
+    public abstract class LadderTestScene : TournamentTestScene
     {
         [Resolved]
         protected LadderInfo Ladder { get; private set; }

osu.Game.Tournament.Tests/Screens/TestSceneGameplayScreen.cs

@@ -2,13 +2,12 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
-using osu.Game.Tests.Visual;
 using osu.Game.Tournament.Components;
 using osu.Game.Tournament.Screens.Gameplay;
 
 namespace osu.Game.Tournament.Tests.Screens
 {
-    public class TestSceneGameplayScreen : OsuTestScene
+    public class TestSceneGameplayScreen : TournamentTestScene
     {
         [Cached]
         private TournamentMatchChatDisplay chat = new TournamentMatchChatDisplay();

osu.Game.Tournament.Tests/Screens/TestSceneScheduleScreen.cs

@@ -2,12 +2,11 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
-using osu.Game.Tests.Visual;
 using osu.Game.Tournament.Screens.Schedule;
 
 namespace osu.Game.Tournament.Tests.Screens
 {
-    public class TestSceneScheduleScreen : OsuTestScene
+    public class TestSceneScheduleScreen : TournamentTestScene
     {
         [BackgroundDependencyLoader]
         private void load()

osu.Game.Tournament.Tests/Screens/TestSceneShowcaseScreen.cs

@@ -2,12 +2,11 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
-using osu.Game.Tests.Visual;
 using osu.Game.Tournament.Screens.Showcase;
 
 namespace osu.Game.Tournament.Tests.Screens
 {
-    public class TestSceneShowcaseScreen : OsuTestScene
+    public class TestSceneShowcaseScreen : TournamentTestScene
     {
         [BackgroundDependencyLoader]
         private void load()

osu.Game.Tournament.Tests/TestSceneTournamentSceneManager.cs

@@ -3,11 +3,10 @@
 
 using osu.Framework.Allocation;
 using osu.Framework.Platform;
-using osu.Game.Tests.Visual;
 
 namespace osu.Game.Tournament.Tests
 {
-    public class TestSceneTournamentSceneManager : OsuTestScene
+    public class TestSceneTournamentSceneManager : TournamentTestScene
     {
         [BackgroundDependencyLoader]
         private void load(Storage storage)

osu.Game.Tournament.Tests/TournamentTestScene.cs

@@ -0,0 +1,28 @@
+// 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 osu.Framework.Testing;
+using osu.Game.Tests.Visual;
+
+namespace osu.Game.Tournament.Tests
+{
+    public abstract class TournamentTestScene : OsuTestScene
+    {
+        protected override ITestSceneTestRunner CreateRunner() => new TournamentTestSceneTestRunner();
+
+        public class TournamentTestSceneTestRunner : TournamentGameBase, ITestSceneTestRunner
+        {
+            private TestSceneTestRunner.TestRunner runner;
+
+            protected override void LoadAsyncComplete()
+            {
+                // this has to be run here rather than LoadComplete because
+                // TestScene.cs is checking the IsLoaded state (on another thread) and expects
+                // the runner to be loaded at that point.
+                Add(runner = new TestSceneTestRunner.TestRunner());
+            }
+
+            public void RunTestBlocking(TestScene test) => runner.RunTestBlocking(test);
+        }
+    }
+}

osu.Game.Tournament/TournamentGameBase.cs

@@ -9,15 +9,20 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Configuration;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Input;
 using osu.Framework.IO.Stores;
 using osu.Framework.Platform;
 using osu.Game.Beatmaps;
+using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Online.API.Requests;
 using osu.Game.Tournament.IPC;
 using osu.Game.Tournament.Models;
+using osuTK.Graphics;
 using osuTK.Input;
 
 namespace osu.Game.Tournament
@@ -35,6 +40,8 @@ namespace osu.Game.Tournament
         private Bindable<Size> windowSize;
         private FileBasedIPC ipc;
 
+        private Drawable heightWarning;
+
         protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
         {
             return dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
@@ -53,6 +60,12 @@ namespace osu.Game.Tournament
             this.storage = storage;
 
             windowSize = frameworkConfig.GetBindable<Size>(FrameworkSetting.WindowedSize);
+            windowSize.BindValueChanged(size => ScheduleAfterChildren(() =>
+            {
+                var minWidth = (int)(size.NewValue.Height / 9f * 16 + 400);
+
+                heightWarning.Alpha = size.NewValue.Width < minWidth ? 1 : 0;
+            }), true);
 
             readBracket();
 
@@ -61,16 +74,43 @@ namespace osu.Game.Tournament
             dependencies.CacheAs<MatchIPCInfo>(ipc = new FileBasedIPC());
             Add(ipc);
 
-            Add(new OsuButton
+            AddRange(new[]
             {
-                Text = "Save Changes",
+                new OsuButton
-                Width = 140,
+                {
-                Height = 50,
+                    Text = "Save Changes",
-                Depth = float.MinValue,
+                    Width = 140,
-                Anchor = Anchor.BottomRight,
+                    Height = 50,
-                Origin = Anchor.BottomRight,
+                    Depth = float.MinValue,
-                Padding = new MarginPadding(10),
+                    Anchor = Anchor.BottomRight,
-                Action = SaveChanges,
+                    Origin = Anchor.BottomRight,
+                    Padding = new MarginPadding(10),
+                    Action = SaveChanges,
+                },
+                heightWarning = new Container
+                {
+                    Masking = true,
+                    CornerRadius = 5,
+                    Depth = float.MinValue,
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    AutoSizeAxes = Axes.Both,
+                    Children = new Drawable[]
+                    {
+                        new Box
+                        {
+                            Colour = Color4.Red,
+                            RelativeSizeAxes = Axes.Both,
+                        },
+                        new SpriteText
+                        {
+                            Text = "Please make the window wider",
+                            Font = OsuFont.Default.With(weight: "bold"),
+                            Colour = Color4.White,
+                            Padding = new MarginPadding(20)
+                        }
+                    }
+                },
             });
         }
 
@@ -195,18 +235,6 @@ namespace osu.Game.Tournament
             base.LoadComplete();
         }
 
-        protected override void Update()
-        {
-            base.Update();
-            var minWidth = (int)(windowSize.Value.Height / 9f * 16 + 400);
-
-            if (windowSize.Value.Width < minWidth)
-            {
-                // todo: can be removed after ppy/osu-framework#1975
-                windowSize.Value = Host.Window.ClientSize = new Size(minWidth, windowSize.Value.Height);
-            }
-        }
-
         protected virtual void SaveChanges()
         {
             foreach (var r in ladder.Rounds)