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

Apply style fixes from code review: remove duplicate screenScale assignment, collapse single-statement ifs to one line, remove trailing periods from comments

Browse Source
This commit is contained in:
0xPD33 2026-02-16 02:20:16 +01:00
parent 3f230027bf
commit e876eefbc1
1 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/platforms/rcore_desktop_glfw.c
View File

@ -1469,10 +1469,8 @@ int InitPlatform(void)
#if defined(__APPLE__) #if defined(__APPLE__)
glfwWindowHint(GLFW_SCALE_FRAMEBUFFER, GLFW_FALSE); glfwWindowHint(GLFW_SCALE_FRAMEBUFFER, GLFW_FALSE);
#endif #endif
// GLFW 3.4+ defaults GLFW_SCALE_FRAMEBUFFER to TRUE, causing framebuffer/window // GLFW 3.4+ defaults GLFW_SCALE_FRAMEBUFFER to TRUE, causing framebuffer/window size mismatch on Wayland with display scaling
// size mismatch on Wayland with display scaling. Disable without FLAG_WINDOW_HIGHDPI. if (glfwGetPlatform() == GLFW_PLATFORM_WAYLAND) glfwWindowHint(GLFW_SCALE_FRAMEBUFFER, GLFW_FALSE);
if (glfwGetPlatform() == GLFW_PLATFORM_WAYLAND)
glfwWindowHint(GLFW_SCALE_FRAMEBUFFER, GLFW_FALSE);
} }
// Mouse passthrough // Mouse passthrough
@ -1671,14 +1669,10 @@ int InitPlatform(void)
// NOTE: On APPLE platforms system manage window and input scaling // NOTE: On APPLE platforms system manage window and input scaling
// Framebuffer scaling is activated with: glfwWindowHint(GLFW_SCALE_FRAMEBUFFER, GLFW_TRUE); // Framebuffer scaling is activated with: glfwWindowHint(GLFW_SCALE_FRAMEBUFFER, GLFW_TRUE);
// Screen scaling matrix is required in case desired screen area is different from display area
CORE.Window.screenScale = MatrixScale(scaleDpi.x, scaleDpi.y, 1.0f);
#if !defined(__APPLE__) #if !defined(__APPLE__)
if (glfwGetPlatform() == GLFW_PLATFORM_WAYLAND) if (glfwGetPlatform() == GLFW_PLATFORM_WAYLAND)
{ {
// On Wayland, GLFW_SCALE_FRAMEBUFFER handles scaling; read actual framebuffer // On Wayland, GLFW_SCALE_FRAMEBUFFER handles scaling; read actual framebuffer size instead of resizing the window (which would double-scale)
// size instead of resizing the window (which would double-scale).
int fbWidth, fbHeight; int fbWidth, fbHeight;
glfwGetFramebufferSize(platform.handle, &fbWidth, &fbHeight); glfwGetFramebufferSize(platform.handle, &fbWidth, &fbHeight);
CORE.Window.render.width = fbWidth; CORE.Window.render.width = fbWidth;
@ -1876,8 +1870,7 @@ static void FramebufferSizeCallback(GLFWwindow *window, int width, int height)
CORE.Window.screenScale = MatrixScale(1.0f, 1.0f, 1.0f); CORE.Window.screenScale = MatrixScale(1.0f, 1.0f, 1.0f);
SetMouseScale(1.0f, 1.0f); SetMouseScale(1.0f, 1.0f);
// On Wayland with GLFW_SCALE_FRAMEBUFFER, the framebuffer is still scaled // On Wayland with GLFW_SCALE_FRAMEBUFFER, the framebuffer is still scaled in fullscreen, use logical window size as screen and apply screenScale
// in fullscreen. Use logical window size as screen and apply screenScale.
if ((glfwGetPlatform() == GLFW_PLATFORM_WAYLAND) && if ((glfwGetPlatform() == GLFW_PLATFORM_WAYLAND) &&
FLAG_IS_SET(CORE.Window.flags, FLAG_WINDOW_HIGHDPI)) FLAG_IS_SET(CORE.Window.flags, FLAG_WINDOW_HIGHDPI))
{ {
@ -1905,8 +1898,7 @@ static void FramebufferSizeCallback(GLFWwindow *window, int width, int height)
CORE.Window.screenScale = MatrixScale(scaleDpi.x, scaleDpi.y, 1.0f); CORE.Window.screenScale = MatrixScale(scaleDpi.x, scaleDpi.y, 1.0f);
#if !defined(__APPLE__) #if !defined(__APPLE__)
// On Wayland, mouse coords are already in logical space // On Wayland, mouse coords are already in logical space
if (glfwGetPlatform() != GLFW_PLATFORM_WAYLAND) if (glfwGetPlatform() != GLFW_PLATFORM_WAYLAND) SetMouseScale(1.0f/scaleDpi.x, 1.0f/scaleDpi.y);
SetMouseScale(1.0f/scaleDpi.x, 1.0f/scaleDpi.y);
#endif #endif
} }
else else
@ -1936,8 +1928,7 @@ static void WindowContentScaleCallback(GLFWwindow *window, float scalex, float s
#if !defined(__APPLE__) #if !defined(__APPLE__)
// On Wayland, mouse coords are already in logical space // On Wayland, mouse coords are already in logical space
if (glfwGetPlatform() != GLFW_PLATFORM_WAYLAND) if (glfwGetPlatform() != GLFW_PLATFORM_WAYLAND) SetMouseScale(1.0f/scalex, 1.0f/scaley);
SetMouseScale(1.0f/scalex, 1.0f/scaley);
#endif #endif
} }