Browse Source

headless: collapse headless window definition into a "Windows" folder, change GetWindowFlags to an abstract property.

Evan Husted 1 year ago
parent
commit
6fc827fe67

+ 1 - 1
src/Ryujinx/Headless/Metal/MetalWindow.cs → 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()
         {

+ 1 - 1
src/Ryujinx/Headless/OpenGL/OpenGLWindow.cs → 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()
         {

+ 1 - 1
src/Ryujinx/Headless/Vulkan/VulkanWindow.cs → 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() { }
 

+ 2 - 2
src/Ryujinx/Headless/WindowBase.cs → 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()
         {