Move some ISDLWindow properties to IWindow

Moves those that were used in platform-agnostic code and tests.
ppy · Nov 28, 2024 · f0824e2 · f0824e2
1 parent 484eade
commit f0824e2
Show file tree

Hide file tree

Showing 8 changed files with 50 additions and 47 deletions.
diff --git a/osu.Framework.Tests/Visual/Platform/TestSceneBorderless.cs b/osu.Framework.Tests/Visual/Platform/TestSceneBorderless.cs
@@ -24,7 +24,7 @@ public partial class TestSceneBorderless : FrameworkTestScene
         private readonly SpriteText currentWindowMode = new SpriteText();
         private readonly SpriteText currentDisplay = new SpriteText();
 
-        private ISDLWindow? window;
+        private IWindow? window;
         private readonly Bindable<WindowMode> windowMode = new Bindable<WindowMode>();
 
         public TestSceneBorderless()
@@ -57,7 +57,7 @@ public TestSceneBorderless()
         [BackgroundDependencyLoader]
         private void load(FrameworkConfigManager config, GameHost host)
         {
-            window = host.Window as ISDLWindow;
+            window = host.Window;
             config.BindWith(FrameworkSetting.WindowMode, windowMode);
 
             windowMode.BindValueChanged(mode => currentWindowMode.Text = $"Window Mode: {mode.NewValue}", true);

diff --git a/osu.Framework.Tests/Visual/Platform/TestSceneFullscreen.cs b/osu.Framework.Tests/Visual/Platform/TestSceneFullscreen.cs
@@ -129,7 +129,7 @@ public void TestScreenModeSwitch()
             if (window.SupportedWindowModes.Contains(WindowMode.Fullscreen))
             {
                 AddStep("change to fullscreen", () => windowMode.Value = WindowMode.Fullscreen);
-                AddAssert("window position updated", () => ((ISDLWindow)window).Position, () => Is.EqualTo(window.CurrentDisplayBindable.Value.Bounds.Location));
+                AddAssert("window position updated", () => window.Position, () => Is.EqualTo(window.CurrentDisplayBindable.Value.Bounds.Location));
                 testResolution(1920, 1080);
                 testResolution(1280, 960);
                 testResolution(9999, 9999);

diff --git a/osu.Framework.Tests/Visual/Platform/TestSceneWindowed.cs b/osu.Framework.Tests/Visual/Platform/TestSceneWindowed.cs
@@ -31,12 +31,12 @@ public partial class TestSceneWindowed : FrameworkTestScene
         [Resolved]
         private FrameworkConfigManager config { get; set; }
 
-        private ISDLWindow sdlWindow;
+        private IWindow window;
 
         [BackgroundDependencyLoader]
         private void load()
         {
-            sdlWindow = (ISDLWindow)host.Window;
+            window = host.Window;
             Children = new Drawable[]
             {
                 new FillFlowContainer
@@ -64,12 +64,12 @@ private void load()
         }
 
         [SetUp]
-        public void SetUp() => Schedule(() => sdlWindow.Resizable = true);
+        public void SetUp() => Schedule(() => window.Resizable = true);
 
         [Test]
         public void TestToggleResizable()
         {
-            AddToggleStep("toggle resizable", state => sdlWindow.Resizable = state);
+            AddToggleStep("toggle resizable", state => window.Resizable = state);
         }
 
         [Test]
@@ -79,16 +79,16 @@ public void TestMinimumSize()
             const int min_height = 768;
 
             AddStep("reset window to valid size", () => setWindowSize(new Size(640, 480)));
-            AddStep("set minimum size above client size", () => sdlWindow.MinSize = new Size(min_width, min_height));
+            AddStep("set minimum size above client size", () => window.MinSize = new Size(min_width, min_height));
             assertWindowSize(new Size(min_width, min_height));
 
             AddStep("reset window to valid size", () => setWindowSize(new Size(1280, 960)));
             AddStep("set client size below minimum size", () => setWindowSize(new Size(640, 480)));
             assertWindowSize(new Size(min_width, min_height));
 
-            AddStep("overlapping size throws", () => Assert.Throws<InvalidOperationException>(() => sdlWindow.MinSize = sdlWindow.MaxSize + new Size(1, 1)));
-            AddStep("negative size throws", () => Assert.Throws<InvalidOperationException>(() => sdlWindow.MinSize = new Size(-1, -1)));
-            AddStep("reset minimum size", () => sdlWindow.MinSize = new Size(640, 480));
+            AddStep("overlapping size throws", () => Assert.Throws<InvalidOperationException>(() => window.MinSize = window.MaxSize + new Size(1, 1)));
+            AddStep("negative size throws", () => Assert.Throws<InvalidOperationException>(() => window.MinSize = new Size(-1, -1)));
+            AddStep("reset minimum size", () => window.MinSize = new Size(640, 480));
         }
 
         [Test]
@@ -98,27 +98,27 @@ public void TestMaximumSize()
             const int max_height = 768;
 
             AddStep("reset window to valid size", () => setWindowSize(new Size(1280, 960)));
-            AddStep("set maximum size below client size", () => sdlWindow.MaxSize = new Size(max_width, max_height));
+            AddStep("set maximum size below client size", () => window.MaxSize = new Size(max_width, max_height));
             assertWindowSize(new Size(max_width, max_height));
 
             // when the maximum window size changes to a value below the current size, the window implicitly enters maximised state.
             // when in maximised state, the "windowed size" config bindable is ineffective until the window goes back to normal.
-            AddStep("reset window to normal state", () => sdlWindow.WindowState = WindowState.Normal);
+            AddStep("reset window to normal state", () => window.WindowState = WindowState.Normal);
 
             AddStep("reset window to valid size", () => setWindowSize(new Size(640, 480)));
             AddStep("set client size above maximum size", () => setWindowSize(new Size(1280, 960)));
             assertWindowSize(new Size(max_width, max_height));
 
-            AddStep("overlapping size throws", () => Assert.Throws<InvalidOperationException>(() => sdlWindow.MaxSize = sdlWindow.MinSize - new Size(1, 1)));
-            AddStep("negative size throws", () => Assert.Throws<InvalidOperationException>(() => sdlWindow.MaxSize = new Size(-1, -1)));
-            AddStep("reset maximum size", () => sdlWindow.MaxSize = new Size(65536, 65536));
+            AddStep("overlapping size throws", () => Assert.Throws<InvalidOperationException>(() => window.MaxSize = window.MinSize - new Size(1, 1)));
+            AddStep("negative size throws", () => Assert.Throws<InvalidOperationException>(() => window.MaxSize = new Size(-1, -1)));
+            AddStep("reset maximum size", () => window.MaxSize = new Size(65536, 65536));
         }
 
         private void setWindowSize(Size size) => config.SetValue(FrameworkSetting.WindowedSize, size);
 
         private void assertWindowSize(Size size)
         {
-            AddAssert($"client size = {size.Width}x{size.Height} (with scale)", () => sdlWindow.ClientSize == (size * sdlWindow.Scale).ToSize());
+            AddAssert($"client size = {size.Width}x{size.Height} (with scale)", () => window.ClientSize == (size * window.Scale).ToSize());
             AddAssert($"size in config = {size.Width}x{size.Height}", () => config.Get<Size>(FrameworkSetting.WindowedSize) == size);
         }
     }

diff --git a/osu.Framework.Tests/Visual/Platform/WindowDisplaysPreview.cs b/osu.Framework.Tests/Visual/Platform/WindowDisplaysPreview.cs
@@ -36,7 +36,7 @@ public partial class WindowDisplaysPreview : Container
         private static readonly Color4 window_fill = new Color4(95, 113, 197, 255);
         private static readonly Color4 window_stroke = new Color4(36, 59, 166, 255);
 
-        private ISDLWindow? window;
+        private IWindow? window;
         private readonly Bindable<WindowMode> windowMode = new Bindable<WindowMode>();
         private readonly Bindable<Display> currentDisplay = new Bindable<Display>();
 
@@ -90,7 +90,7 @@ public WindowDisplaysPreview()
         [BackgroundDependencyLoader]
         private void load(FrameworkConfigManager config, GameHost host)
         {
-            window = host.Window as ISDLWindow;
+            window = host.Window;
             config.BindWith(FrameworkSetting.WindowMode, windowMode);
 
             if (window != null)

diff --git a/osu.Framework/Input/UserInputManager.cs b/osu.Framework/Input/UserInputManager.cs
@@ -4,7 +4,6 @@
 using System;
 using System.Collections.Immutable;
 using System.Drawing;
-using osu.Framework.Configuration;
 using osu.Framework.Extensions.EnumExtensions;
 using osu.Framework.Input.Handlers;
 using osu.Framework.Input.StateChanges;
@@ -85,20 +84,8 @@ public override void HandleInputStateChange(InputStateChangeEvent inputStateChan
 
         private bool mouseOutsideAllDisplays(Vector2 mousePosition)
         {
-            Point windowLocation;
-
-            switch (Host.Window.WindowMode.Value)
-            {
-                case WindowMode.Windowed:
-                    windowLocation = Host.Window is ISDLWindow sdlWindow ? sdlWindow.Position : Point.Empty;
-                    break;
-
-                default:
-                    windowLocation = Host.Window.CurrentDisplayBindable.Value.Bounds.Location;
-                    break;
-            }
-
-            float scale = Host.Window is ISDLWindow window ? window.Scale : 1;
+            Point windowLocation = Host.Window.Position;
+            float scale = Host.Window.Scale;
             mousePosition /= scale;
 
             int x = (int)MathF.Floor(windowLocation.X + mousePosition.X);

diff --git a/osu.Framework/Platform/ISDLWindow.cs b/osu.Framework/Platform/ISDLWindow.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Drawing;
 using osu.Framework.Bindables;
 using osu.Framework.Input;
 using osuTK;
@@ -27,15 +26,9 @@ internal interface ISDLWindow : IWindow
         event Action<Key> KeyUp;
         event Action<string> TextInput;
         event TextEditingDelegate TextEditing;
-        event Action<WindowState> WindowStateChanged;
 
         Bindable<CursorState> CursorStateBindable { get; }
 
-        Point Position { get; }
-        Size Size { get; }
-        float Scale { get; }
-        bool Resizable { get; set; }
-
         bool MouseAutoCapture { set; }
         bool RelativeMouseMode { get; set; }
         bool CapsLockPressed { get; }

diff --git a/osu.Framework/Platform/IWindow.cs b/osu.Framework/Platform/IWindow.cs
@@ -124,6 +124,11 @@ public interface IWindow : IDisposable
         /// </summary>
         WindowState WindowState { get; set; }
 
+        /// <summary>
+        /// Invoked when <see cref="WindowState"/> changes.
+        /// </summary>
+        event Action<WindowState>? WindowStateChanged;
+
         /// <summary>
         /// Returns the default <see cref="WindowMode"/> for the implementation.
         /// </summary>
@@ -248,10 +253,25 @@ public interface IWindow : IDisposable
         Point PointToScreen(Point point);
 
         /// <summary>
-        /// The client size of the window (excluding any window decoration/border).
+        /// The client size of the window in pixels (excluding any window decoration/border).
         /// </summary>
         Size ClientSize { get; }
 
+        /// <summary>
+        /// The position of the window.
+        /// </summary>
+        Point Position { get; }
+
+        /// <summary>
+        /// The size of the window in scaled pixels (excluding any window decoration/border).
+        /// </summary>
+        Size Size { get; }
+
+        /// <summary>
+        /// The ratio of <see cref="ClientSize"/> and <see cref="Size"/>.
+        /// </summary>
+        float Scale { get; }
+
         /// <summary>
         /// The minimum size of the window.
         /// </summary>
@@ -264,6 +284,11 @@ public interface IWindow : IDisposable
         /// <exception cref="InvalidOperationException">Thrown when setting a negative or zero size, or a size less than <see cref="MinSize"/>.</exception>
         Size MaxSize { get; set; }
 
+        /// <summary>
+        /// Gets or sets whether the window is user-resizable.
+        /// </summary>
+        bool Resizable { get; set; }
+
         /// <summary>
         /// The window title.
         /// </summary>

diff --git a/osu.Framework/Platform/Windows/WindowsGLRenderer.cs b/osu.Framework/Platform/Windows/WindowsGLRenderer.cs
@@ -28,8 +28,6 @@ protected override void Initialise(IGraphicsSurface graphicsSurface)
         {
             base.Initialise(graphicsSurface);
 
-            ISDLWindow windowsWindow = (ISDLWindow)host.Window;
-
             bool isIntel = GL.GetString(StringName.Vendor).Trim() == "Intel";
 
             if (isIntel)
@@ -40,9 +38,9 @@ protected override void Initialise(IGraphicsSurface graphicsSurface)
             else
             {
                 // For all other vendors, support depends on the system setup - e.g. NVIDIA Optimus doesn't support exclusive fullscreen with OpenGL.
-                windowsWindow.IsActive.BindValueChanged(_ => detectFullscreenCapability(windowsWindow));
-                windowsWindow.WindowStateChanged += _ => detectFullscreenCapability(windowsWindow);
-                detectFullscreenCapability(windowsWindow);
+                host.Window.IsActive.BindValueChanged(_ => detectFullscreenCapability(host.Window));
+                host.Window.WindowStateChanged += _ => detectFullscreenCapability(host.Window);
+                detectFullscreenCapability(host.Window);
             }
         }