From 2ceddc89459a02391fa5298f07922555ff305d3b Mon Sep 17 00:00:00 2001 From: Hristo Stamenov Date: Sun, 27 Dec 2020 16:04:29 +0200 Subject: [PATCH] Disabling WindowSizeCallback around fullscreen toggle. #1294 fixed the issue that toggle fullscreen changes the screen size because of the WindowSizeCallback. The proposed edit by @raysan5 was to comment out WindowSizeCallback which I essentially simplified to disable the callback around the set window monitor functions. The developers using the ToggleFullscreen function should be aware that they need to size the screen correctly on that same frame. Otherwise they should check if fullscreen and size properly using the GetMonitorWidth and GetMonitorHeight functions. --- src/core.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/core.c b/src/core.c index e6d27e5f9..be95665b9 100644 --- a/src/core.c +++ b/src/core.c @@ -1029,18 +1029,27 @@ void ToggleFullscreen(void) if (!monitor) { TRACELOG(LOG_WARNING, "GLFW: Failed to get monitor"); + glfwSetWindowSizeCallback(CORE.Window.handle, NULL); glfwSetWindowMonitor(CORE.Window.handle, glfwGetPrimaryMonitor(), 0, 0, CORE.Window.screen.width, CORE.Window.screen.height, GLFW_DONT_CARE); + glfwSetWindowSizeCallback(CORE.Window.handle, WindowSizeCallback); return; } - + const GLFWvidmode *mode = glfwGetVideoMode(monitor); + glfwSetWindowSizeCallback(CORE.Window.handle, NULL); glfwSetWindowMonitor(CORE.Window.handle, glfwGetPrimaryMonitor(), 0, 0, CORE.Window.screen.width, CORE.Window.screen.height, mode->refreshRate); + glfwSetWindowSizeCallback(CORE.Window.handle, WindowSizeCallback); // Try to enable GPU V-Sync, so frames are limited to screen refresh rate (60Hz -> 60 FPS) // NOTE: V-Sync can be enabled by graphic driver configuration if (CORE.Window.flags & FLAG_VSYNC_HINT) glfwSwapInterval(1); } - else glfwSetWindowMonitor(CORE.Window.handle, NULL, CORE.Window.position.x, CORE.Window.position.y, CORE.Window.screen.width, CORE.Window.screen.height, GLFW_DONT_CARE); + else + { + glfwSetWindowSizeCallback(CORE.Window.handle, NULL); + glfwSetWindowMonitor(CORE.Window.handle, NULL, CORE.Window.position.x, CORE.Window.position.y, CORE.Window.screen.width, CORE.Window.screen.height, GLFW_DONT_CARE); + glfwSetWindowSizeCallback(CORE.Window.handle, WindowSizeCallback); + } CORE.Window.fullscreen = !CORE.Window.fullscreen; // Toggle fullscreen flag CORE.Window.flags ^= FLAG_FULLSCREEN_MODE;