From 6fc827fe67efcbc6f0a4dead1c08e8b4beaa4dc8 Mon Sep 17 00:00:00 2001
From: Evan Husted <greem@greemdev.net>
Date: Sat, 18 Jan 2025 10:15:24 -0600
Subject: [PATCH] headless: collapse headless window definition into a
 "Windows" folder, change GetWindowFlags to an abstract property.

---
 src/Ryujinx/Headless/{Metal => Windows}/MetalWindow.cs   | 2 +-
 src/Ryujinx/Headless/{OpenGL => Windows}/OpenGLWindow.cs | 2 +-
 src/Ryujinx/Headless/{Vulkan => Windows}/VulkanWindow.cs | 2 +-
 src/Ryujinx/Headless/{ => Windows}/WindowBase.cs         | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)
 rename src/Ryujinx/Headless/{Metal => Windows}/MetalWindow.cs (93%)
 rename src/Ryujinx/Headless/{OpenGL => Windows}/OpenGLWindow.cs (98%)
 rename src/Ryujinx/Headless/{Vulkan => Windows}/VulkanWindow.cs (97%)
 rename src/Ryujinx/Headless/{ => Windows}/WindowBase.cs (99%)

diff --git a/src/Ryujinx/Headless/Metal/MetalWindow.cs b/src/Ryujinx/Headless/Windows/MetalWindow.cs
similarity index 93%
rename from src/Ryujinx/Headless/Metal/MetalWindow.cs
rename to src/Ryujinx/Headless/Windows/MetalWindow.cs
index a2693c69d..d79bd7938 100644
--- a/src/Ryujinx/Headless/Metal/MetalWindow.cs
+++ b/src/Ryujinx/Headless/Windows/MetalWindow.cs
@@ -26,7 +26,7 @@ namespace Ryujinx.Headless
             bool ignoreControllerApplet)
             : base(inputManager, glLogLevel, aspectRatio, enableMouse, hideCursorMode, ignoreControllerApplet) { }
 
-        public override SDL_WindowFlags GetWindowFlags() => SDL_WindowFlags.SDL_WINDOW_METAL;
+        public override SDL_WindowFlags WindowFlags => SDL_WindowFlags.SDL_WINDOW_METAL;
 
         protected override void InitializeWindowRenderer()
         {
diff --git a/src/Ryujinx/Headless/OpenGL/OpenGLWindow.cs b/src/Ryujinx/Headless/Windows/OpenGLWindow.cs
similarity index 98%
rename from src/Ryujinx/Headless/OpenGL/OpenGLWindow.cs
rename to src/Ryujinx/Headless/Windows/OpenGLWindow.cs
index c00a0648f..23c64ad4f 100644
--- a/src/Ryujinx/Headless/OpenGL/OpenGLWindow.cs
+++ b/src/Ryujinx/Headless/Windows/OpenGLWindow.cs
@@ -124,7 +124,7 @@ namespace Ryujinx.Headless
             _glLogLevel = glLogLevel;
         }
 
-        public override SDL_WindowFlags GetWindowFlags() => SDL_WindowFlags.SDL_WINDOW_OPENGL;
+        public override SDL_WindowFlags WindowFlags => SDL_WindowFlags.SDL_WINDOW_OPENGL;
 
         protected override void InitializeWindowRenderer()
         {
diff --git a/src/Ryujinx/Headless/Vulkan/VulkanWindow.cs b/src/Ryujinx/Headless/Windows/VulkanWindow.cs
similarity index 97%
rename from src/Ryujinx/Headless/Vulkan/VulkanWindow.cs
rename to src/Ryujinx/Headless/Windows/VulkanWindow.cs
index 92caad34e..5f6de94a5 100644
--- a/src/Ryujinx/Headless/Vulkan/VulkanWindow.cs
+++ b/src/Ryujinx/Headless/Windows/VulkanWindow.cs
@@ -24,7 +24,7 @@ namespace Ryujinx.Headless
             _glLogLevel = glLogLevel;
         }
 
-        public override SDL_WindowFlags GetWindowFlags() => SDL_WindowFlags.SDL_WINDOW_VULKAN;
+        public override SDL_WindowFlags WindowFlags => SDL_WindowFlags.SDL_WINDOW_VULKAN;
 
         protected override void InitializeWindowRenderer() { }
 
diff --git a/src/Ryujinx/Headless/WindowBase.cs b/src/Ryujinx/Headless/Windows/WindowBase.cs
similarity index 99%
rename from src/Ryujinx/Headless/WindowBase.cs
rename to src/Ryujinx/Headless/Windows/WindowBase.cs
index d89638cc1..b2d18fac1 100644
--- a/src/Ryujinx/Headless/WindowBase.cs
+++ b/src/Ryujinx/Headless/Windows/WindowBase.cs
@@ -191,7 +191,7 @@ namespace Ryujinx.Headless
                 FullscreenFlag = SDL_WindowFlags.SDL_WINDOW_FULLSCREEN_DESKTOP;
             }
 
-            WindowHandle = SDL_CreateWindow($"Ryujinx {Program.Version}{titleNameSection}{titleVersionSection}{titleIdSection}{titleArchSection}", SDL_WINDOWPOS_CENTERED_DISPLAY(DisplayId), SDL_WINDOWPOS_CENTERED_DISPLAY(DisplayId), Width, Height, DefaultFlags | FullscreenFlag | GetWindowFlags());
+            WindowHandle = SDL_CreateWindow($"Ryujinx {Program.Version}{titleNameSection}{titleVersionSection}{titleIdSection}{titleArchSection}", SDL_WINDOWPOS_CENTERED_DISPLAY(DisplayId), SDL_WINDOWPOS_CENTERED_DISPLAY(DisplayId), Width, Height, DefaultFlags | FullscreenFlag | WindowFlags);
 
             if (WindowHandle == nint.Zero)
             {
@@ -246,7 +246,7 @@ namespace Ryujinx.Headless
 
         protected abstract void SwapBuffers();
 
-        public abstract SDL_WindowFlags GetWindowFlags();
+        public abstract SDL_WindowFlags WindowFlags { get; }
 
         private string GetGpuDriverName()
         {