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

rcore_desktop_glfw.c : fix HDPI scaling on Win11 + window restoration on Wayland

Browse Source 
As a general rule, Raylib API functions should not be used internally by the platform code, because these functions may be tuned for cross-platform consistency so they return consistent data relevant to the user perspective, and not to the platform code perspective.

---

I don't know if it is a GLFW bug, but on Wayland, the `WindowSizeCallback()` is not called when the window is restored from a fullscreen mode, and I had to workaround that.
As discovered by @SoloByte, using `glfwSetFramebufferSizeCallback()` instead of `glfwSetWindowSizeCallback()` solves this issue on Wayland, and deprecate the workaround.
This commit is contained in:
SuperUserNameMan 2024-07-23 14:24:52 +02:00 committed by GitHub
parent f3d8fc75e9
commit df62c800fa
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/platforms/rcore_desktop_glfw.c
View File

@ -247,15 +247,7 @@ 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);
if (glfwGetPlatform() == GLFW_PLATFORM_WAYLAND)
{
// Apparently, Wayland does not call the resize callback when required ...
WindowSizeCallback(platform.handle, prevWidth, prevHeight);
}
else
{
_SetupFramebuffer(prevWidth , prevHeight, false); _SetupFramebuffer(prevWidth , prevHeight, false);
}
// Refocus window // Refocus window
glfwFocusWindow(platform.handle); glfwFocusWindow(platform.handle);
@ -1732,7 +1724,10 @@ int InitPlatform(void)
// Initialize input events callbacks // Initialize input events callbacks
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
// Set window callback events // Set window callback events
glfwSetWindowSizeCallback(platform.handle, WindowSizeCallback); // NOTE: Resizing not allowed by default!
//!\ `glfwSetFramebufferSizeCallback()` offers better cross-platform compatibility than `glfwSetWindowSizeCallback()`
glfwSetFramebufferSizeCallback(platform.handle, WindowSizeCallback);
glfwSetWindowMaximizeCallback(platform.handle, WindowMaximizeCallback); glfwSetWindowMaximizeCallback(platform.handle, WindowMaximizeCallback);
glfwSetWindowIconifyCallback(platform.handle, WindowIconifyCallback); glfwSetWindowIconifyCallback(platform.handle, WindowIconifyCallback);
glfwSetWindowFocusCallback(platform.handle, WindowFocusCallback); glfwSetWindowFocusCallback(platform.handle, WindowFocusCallback);
@ -2044,18 +2039,20 @@ static void _SetupFramebuffer(int frameBufferWidth, int frameBufferHeight, bool
if (!inHardwareFullscreenMode && requestWindowHDPI && !weAreOnWaylandPlatform) if (!inHardwareFullscreenMode && requestWindowHDPI && !weAreOnWaylandPlatform)
{ {
Vector2 windowScaleDPI = GetWindowScaleDPI(); Vector2 scaleDPI;
//!\ We must not use `GetWindowScaleDPI()` because it returns data relevant to the user, not to the platform.
glfwGetWindowContentScale(platform.handle, &scaleDPI.x, &scaleDPI.y);
// If the window is in windowed fullscreen mode (aka `FLAG_BORDERLESS_WINDOWED_MODE`) // If the window is in windowed fullscreen mode (aka `FLAG_BORDERLESS_WINDOWED_MODE`)
// the size of the frameBuffer is set to the size of the display. // the size of the frameBuffer is set to the size of the display.
// This means that GLFW could not resize the window and its frameBuffer accordingly to the DPI. // This means that GLFW could not resize the window and its frameBuffer accordingly to the DPI.
// The consequence is that we have to recompute the size of the screen accordingly // The consequence is that we have to recompute the size of the screen accordingly
// to the size of the frameBuffer provided by GLFW. // to the size of the frameBuffer provided by GLFW.
CORE.Window.screen.width = (unsigned int)roundf(frameBufferWidth/windowScaleDPI.x); CORE.Window.screen.width = (unsigned int)roundf(frameBufferWidth/scaleDPI.x);
CORE.Window.screen.height = (unsigned int)roundf(frameBufferHeight/windowScaleDPI.y); CORE.Window.screen.height = (unsigned int)roundf(frameBufferHeight/scaleDPI.y);
// And now, the screen should be scaled to fit into the render : // And now, the screen should be scaled to fit into the render :
CORE.Window.screenScale = MatrixScale(windowScaleDPI.x, windowScaleDPI.y, 1.0); CORE.Window.screenScale = MatrixScale(scaleDPI.x, scaleDPI.y, 1.0);
} }
else // On Wayland, the screen should not need to be rescaled // TODO test Wayland else // On Wayland, the screen should not need to be rescaled // TODO test Wayland
{ {
@ -2320,14 +2317,7 @@ static void _DeactivateHardwareFullscreenMode()
int prevWidth = CORE.Window.previousScreen.width; int prevWidth = CORE.Window.previousScreen.width;
int prevHeight = CORE.Window.previousScreen.height; int prevHeight = CORE.Window.previousScreen.height;
if (glfwGetPlatform() == GLFW_PLATFORM_WAYLAND)
{
WindowSizeCallback(platform.handle, prevWidth, prevHeight);
}
else
{
_SetupFramebuffer(prevWidth, prevHeight, false); _SetupFramebuffer(prevWidth, prevHeight, false);
}
// Then we're done ! // Then we're done !