From 2380772eebf80d8033ab11bfb36e1a8d91175945 Mon Sep 17 00:00:00 2001
From: XenoMustache <xenomustache@gmail.com>
Date: Tue, 2 Dec 2025 12:28:14 -0800
Subject: [PATCH] Fix window not resetting properly when toggling out of
 fullscreen, formatting

---
 src/platforms/rcore_desktop_glfw.c | 32 +++++++++++++++++-------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/src/platforms/rcore_desktop_glfw.c b/src/platforms/rcore_desktop_glfw.c
index a7e4799e2..211e0f701 100644
--- a/src/platforms/rcore_desktop_glfw.c
+++ b/src/platforms/rcore_desktop_glfw.c
@@ -265,18 +265,15 @@ void ToggleBorderlessWindowed(void)
                 const int monitorHeight = mode->height;
 
                 // Set screen position and size
-            	glfwSetWindowMonitor(
-					platform.handle,
-					monitors[monitor],
-					monitorPosX,
-					monitorPosY,
-					monitorWidth,
-					monitorHeight,
-					mode->refreshRate
-				);
-
-                // glfwSetWindowPos(platform.handle, monitorPosX, monitorPosY);
-                // glfwSetWindowSize(platform.handle, monitorWidth, monitorHeight);
+                glfwSetWindowMonitor(
+                    platform.handle,
+                    monitors[monitor],
+                    monitorPosX,
+                    monitorPosY,
+                    monitorWidth,
+                    monitorHeight,
+                    mode->refreshRate
+                );
 
                 // Refocus window
                 glfwFocusWindow(platform.handle);
@@ -291,8 +288,15 @@ void ToggleBorderlessWindowed(void)
 
                 // Return previous screen size and position
                 // NOTE: The order matters here, it must set size first, then set position, otherwise the screen will be positioned incorrectly
-                glfwSetWindowSize(platform.handle,  CORE.Window.previousScreen.width, CORE.Window.previousScreen.height);
-                glfwSetWindowPos(platform.handle, CORE.Window.previousPosition.x, CORE.Window.previousPosition.y);
+                glfwSetWindowMonitor(
+                    platform.handle,
+                    NULL,
+                    CORE.Window.previousPosition.x,
+                    CORE.Window.previousPosition.y,
+                    CORE.Window.previousScreen.width,
+                    CORE.Window.previousScreen.height,
+            	    mode->refreshRate
+            	);
 
                 // Refocus window
                 glfwFocusWindow(platform.handle);