From 4f8bb06d8e555761d3df48df1d69ce888f862424 Mon Sep 17 00:00:00 2001
From: madwind <madwind.cn@gmail.com>
Date: Sun, 19 Jan 2025 11:10:03 +0800
Subject: [PATCH] merge

---
 src/Ryujinx/Headless/Windows/OpenGLWindow.cs |  9 ++++-----
 src/Ryujinx/Headless/Windows/WindowBase.cs   | 12 +++---------
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/src/Ryujinx/Headless/Windows/OpenGLWindow.cs b/src/Ryujinx/Headless/Windows/OpenGLWindow.cs
index d19622988..7909b655d 100644
--- a/src/Ryujinx/Headless/Windows/OpenGLWindow.cs
+++ b/src/Ryujinx/Headless/Windows/OpenGLWindow.cs
@@ -106,8 +106,7 @@ namespace Ryujinx.Headless
                 }
             }
         }
-        
-        private readonly GraphicsDebugLevel _glLogLevel;
+
         private SDL3OpenGLContext _openGLContext;
 
         public OpenGLWindow(
@@ -121,12 +120,12 @@ namespace Ryujinx.Headless
         {
         }
 
-        public override SDL_WindowFlags WindowFlags() => SDL_WindowFlags.SDL_WINDOW_OPENGL;
+        public override SDL_WindowFlags WindowFlags => SDL_WindowFlags.SDL_WINDOW_OPENGL;
 
         protected override void InitializeWindowRenderer()
         {
             // Ensure to not share this context with other contexts before this point.
-            SetupOpenGLAttributes(false, _glLogLevel);
+            SetupOpenGLAttributes(false, GlLogLevel);
             nint context = SDL_GL_CreateContext(WindowHandle);
             CheckResult(SDL_GL_SetSwapInterval(1));
 
@@ -159,7 +158,7 @@ namespace Ryujinx.Headless
             else if (IsFullscreen)
             {
                 // NOTE: grabbing the main display's dimensions directly as OpenGL doesn't scale along like the VulkanWindow.
-                if (SDL_GetDisplayBounds((uint)DisplayId, out SDL_Rect displayBounds))
+                if (!SDL_GetDisplayBounds((uint)DisplayId, out SDL_Rect displayBounds))
                 {
                     Logger.Warning?.Print(LogClass.Application, $"Could not retrieve display bounds: {SDL_GetError()}");
 
diff --git a/src/Ryujinx/Headless/Windows/WindowBase.cs b/src/Ryujinx/Headless/Windows/WindowBase.cs
index f4b0c5598..58d3ef774 100644
--- a/src/Ryujinx/Headless/Windows/WindowBase.cs
+++ b/src/Ryujinx/Headless/Windows/WindowBase.cs
@@ -1,6 +1,6 @@
 using Humanizer;
+using LibHac.Util;
 using Ryujinx.Ava;
-using Ryujinx.Ava.UI.Models;
 using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Configuration.Hid;
@@ -34,11 +34,7 @@ namespace Ryujinx.Headless
         protected const int DefaultWidth = 1280;
         protected const int DefaultHeight = 720;
         private const int TargetFps = 60;
-
-        private SDL_WindowFlags DefaultFlags = SDL_WindowFlags.SDL_WINDOW_HIGH_PIXEL_DENSITY |
-                                               SDL_WindowFlags.SDL_WINDOW_RESIZABLE |
-                                               SDL_WindowFlags.SDL_WINDOW_INPUT_FOCUS;
-
+        private SDL_WindowFlags DefaultFlags = SDL_WindowFlags.SDL_WINDOW_HIGH_PIXEL_DENSITY | SDL_WindowFlags.SDL_WINDOW_RESIZABLE | SDL_WindowFlags.SDL_WINDOW_INPUT_FOCUS;
         private SDL_WindowFlags FullscreenFlag = 0;
 
         private static readonly ConcurrentQueue<Action> _mainThreadActions = new();
@@ -57,8 +53,6 @@ namespace Ryujinx.Headless
         public Switch Device { get; private set; }
         public IRenderer Renderer { get; private set; }
 
-        public event EventHandler<StatusUpdatedEventArgs> StatusUpdatedEvent;
-
         protected nint WindowHandle { get; set; }
 
         public IHostUITheme HostUITheme { get; }
@@ -195,7 +189,7 @@ namespace Ryujinx.Headless
                 FullscreenFlag = SDL_WindowFlags.SDL_WINDOW_FULLSCREEN;
             }
 
-            WindowHandle = SDL_CreateWindow($"Ryujinx {Program.Version}{titleNameSection}{titleVersionSection}{titleIdSection}{titleArchSection}", Width, Height, DefaultFlags | FullscreenFlag | WindowFlags());
+            WindowHandle = SDL_CreateWindow($"Ryujinx {Program.Version}{titleNameSection}{titleVersionSection}{titleIdSection}{titleArchSection}", Width, Height, DefaultFlags | FullscreenFlag | WindowFlags);
 
             if (WindowHandle == nint.Zero)
             {