MrMonopoly/raylib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

immediate access to GetScreenWidth/Height(), GetRenderWidth/Height()

Browse Source 
Call `WindowSizeCallback()` manually so we don't have to wait for after the next `EndDrawing()` to have access to up to date `GetScreenWidth()` etc value.
This commit is contained in:
SuperUserNameMan 2024-07-11 19:02:47 +02:00 committed by GitHub
parent 545665da87
commit b004531efb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/platforms/rcore_desktop_glfw.c
View File

@ -190,7 +190,14 @@ void ToggleFullscreen(void)
CORE.Window.previousScreen.width = renderingWidth; CORE.Window.previousScreen.width = renderingWidth;
CORE.Window.previousScreen.height = renderingHeight; CORE.Window.previousScreen.height = renderingHeight;
// GLFW will pick the best monitor resolution it can find for the size of rendering :
// TODO pick the resolution ourself and try to rescale and center with black borders
glfwSetWindowMonitor(platform.handle, monitor, 0, 0, renderingWidth, renderingHeight, GLFW_DONT_CARE); glfwSetWindowMonitor(platform.handle, monitor, 0, 0, renderingWidth, renderingHeight, GLFW_DONT_CARE);
// GLFW will call WindowSizeCallback too late after EndDrawing()
// Let's call it already so the user can access updated values without further delay :
const GLFWvidmode *mode = glfwGetVideoMode( monitor );
WindowSizeCallback(platform.handle, mode->width, mode->height);
} }
} }
@ -199,7 +206,12 @@ void ToggleFullscreen(void)
CORE.Window.fullscreen = false; CORE.Window.fullscreen = false;
CORE.Window.flags &= ~FLAG_FULLSCREEN_MODE; CORE.Window.flags &= ~FLAG_FULLSCREEN_MODE;
// Ask GLFW to restore the window and the previous monitor resolution :
glfwSetWindowMonitor(platform.handle, NULL, CORE.Window.previousPosition.x, CORE.Window.previousPosition.y, CORE.Window.previousScreen.width, CORE.Window.previousScreen.height, GLFW_DONT_CARE); glfwSetWindowMonitor(platform.handle, NULL, CORE.Window.previousPosition.x, CORE.Window.previousPosition.y, CORE.Window.previousScreen.width, CORE.Window.previousScreen.height, GLFW_DONT_CARE);
// GLFW will call WindowSizeCallback too late after EndDrawing()
// Let's call it already so the user can access updated values without further delay :
WindowSizeCallback(platform.handle, CORE.Window.previousScreen.width, CORE.Window.previousScreen.height);
} }
// Try to enable GPU V-Sync, so frames are limited to screen refresh rate (60Hz -> 60 FPS) // Try to enable GPU V-Sync, so frames are limited to screen refresh rate (60Hz -> 60 FPS)
@ -246,9 +258,9 @@ void ToggleBorderlessWindowed(void)
// Ask fullscreen window : // Ask fullscreen window :
glfwSetWindowMonitor(platform.handle, monitors[monitor], 0, 0, mode->width, mode->height, mode->refreshRate); glfwSetWindowMonitor(platform.handle, monitors[monitor], 0, 0, mode->width, mode->height, mode->refreshRate);
// Let's not wait for GLFW to call WindowSizeCallback to update these values : // GLFW will call WindowSizeCallback too late after EndDrawing()
CORE.Window.screen.width = mode->width; // Let's call it already so the user can access updated values without further delay :
CORE.Window.screen.height = mode->height; WindowSizeCallback(platform.handle, mode->width, mode->height);
// Refocus window // Refocus window
glfwFocusWindow(platform.handle); glfwFocusWindow(platform.handle);
@ -265,9 +277,9 @@ void ToggleBorderlessWindowed(void)
glfwSetWindowMonitor(platform.handle, NULL, prevPosX, prevPosY, prevWidth, prevHeight, GLFW_DONT_CARE); glfwSetWindowMonitor(platform.handle, NULL, prevPosX, prevPosY, prevWidth, prevHeight, GLFW_DONT_CARE);
// Let's not wait for GLFW to call WindowSizeCallback to update these values : // GLFW will call WindowSizeCallback too late after EndDrawing()
CORE.Window.screen.width = prevWidth; // Let's call it already so the user can access updated values without further delay :
CORE.Window.screen.height = prevHeight; WindowSizeCallback(platform.handle, prevWidth, prevHeight);
// Refocus window // Refocus window
glfwFocusWindow(platform.handle); glfwFocusWindow(platform.handle);