[rcore][desktop_glfw] Reviewed ToggleFullScreen(), ToggleBorderlessWindowed() and FLAG_WINDOW_HIGHDPI issues
#4151
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -144,10 +144,19 @@ bool WindowShouldClose(void) | |
| // Toggle fullscreen mode | ||
| void ToggleFullscreen(void) | ||
| { | ||
| if (IsWindowState(FLAG_BORDERLESS_WINDOWED_MODE)) | ||
| { | ||
| // We can't go straighforward from one fullscreen mode to an other | ||
| // there needs to be at least one loop between them | ||
| // so we just toggle the currently active fullscreen mode and leave. | ||
| ToggleBorderlessWindowed(); | ||
| return; | ||
| } | ||
|
|
||
| if (!CORE.Window.fullscreen) | ||
| { | ||
| // Store previous window position (in case we exit fullscreen) | ||
| glfwGetWindowPos(platform.handle, &CORE.Window.previousPosition.x, &CORE.Window.previousPosition.y); | ||
|
|
||
| int monitorCount = 0; | ||
| int monitorIndex = GetCurrentMonitor(); | ||
|
|
@@ -156,21 +165,39 @@ void ToggleFullscreen(void) | |
| // Use current monitor, so we correctly get the display the window is on | ||
| GLFWmonitor *monitor = (monitorIndex < monitorCount)? monitors[monitorIndex] : NULL; | ||
|
|
||
| // The size at which the content of the window shall be rendered | ||
| // taking into account the DPI scaling if FLAG_WINDOW_HIGHDPI is set : | ||
| int renderingWidth = GetRenderWidth(); | ||
| int renderingHeight = GetRenderHeight(); | ||
|
|
||
| if (monitor == NULL) | ||
| { | ||
| TRACELOG(LOG_WARNING, "GLFW: ToggleFullscreen() failed to get monitor"); | ||
|
|
||
| CORE.Window.fullscreen = false; | ||
| CORE.Window.flags &= ~FLAG_FULLSCREEN_MODE; | ||
|
|
||
| // There is nothing more to do. Just leave the window where it is. | ||
| } | ||
| else | ||
| { | ||
| CORE.Window.fullscreen = true; | ||
| CORE.Window.flags |= FLAG_FULLSCREEN_MODE; | ||
|
|
||
| // We need to save the "size at which the content of the window is rendered" | ||
| // because we might have FLAG_WINDOW_HIGHDPI enabled. | ||
|
|
||
| CORE.Window.previousScreen.width = renderingWidth; | ||
| 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); | ||
|
|
||
| // 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); | ||
| } | ||
|
|
||
| } | ||
|
|
@@ -179,9 +206,17 @@ void ToggleFullscreen(void) | |
| CORE.Window.fullscreen = false; | ||
| 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); | ||
|
|
||
| // 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); | ||
| } | ||
|
|
||
| // Refocus window | ||
| glfwFocusWindow(platform.handle); | ||
|
There was a problem hiding this comment. We should also test what happens when focus is lost while being in fullscreen/borderless fullscreen mode in general (like tabbing out to another window) and what happens when focus is gained again. Currently when I tab out of a fullscreen window (works fine) and then tab into it again it stays minimized on macOS. There is callback for window focused in GLFW but I don't if it is used in raylib. There was a problem hiding this comment. FYI: |
||
|
|
||
| // 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); | ||
|
|
@@ -190,13 +225,13 @@ void ToggleFullscreen(void) | |
| // Toggle borderless windowed mode | ||
| void ToggleBorderlessWindowed(void) | ||
| { | ||
| if (CORE.Window.fullscreen) | ||
| { | ||
| // We can't go straighforward from one fullscreen mode to an other | ||
| // there needs to be at least one loop between them | ||
| // so we just toggle the currently active fullscreen mode and leave. | ||
| ToggleFullscreen(); | ||
| return; | ||
| } | ||
|
|
||
| const int monitor = GetCurrentMonitor(); | ||
|
|
@@ -211,27 +246,24 @@ void ToggleBorderlessWindowed(void) | |
| { | ||
| if (!IsWindowState(FLAG_BORDERLESS_WINDOWED_MODE)) | ||
| { | ||
| // Store screen position and size : | ||
| glfwGetWindowPos(platform.handle, &CORE.Window.previousPosition.x, &CORE.Window.previousPosition.y); | ||
|
|
||
| // We need to save the "render size" intead of the "screen size" | ||
| // because we might have FLAG_WINDOW_HIGHDPI enabled. | ||
|
|
||
| int renderWidth = GetRenderWidth(); | ||
| int renderHeight = GetRenderHeight(); | ||
|
|
||
| CORE.Window.previousScreen.width = renderWidth; | ||
| CORE.Window.previousScreen.height = renderHeight; | ||
|
|
||
| // Ask fullscreen window : | ||
| glfwSetWindowMonitor(platform.handle, monitors[monitor], 0, 0, mode->width, mode->height, mode->refreshRate); | ||
|
|
||
| // 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, mode->width, mode->height); | ||
|
|
||
| // Refocus window | ||
| glfwFocusWindow(platform.handle); | ||
|
|
@@ -240,16 +272,17 @@ void ToggleBorderlessWindowed(void) | |
| } | ||
| else | ||
| { | ||
| // Return previous screen size and position | ||
| int prevPosX = CORE.Window.previousPosition.x; | ||
| int prevPosY = CORE.Window.previousPosition.y; | ||
| int prevWidth = CORE.Window.previousScreen.width; | ||
| int prevHeight = CORE.Window.previousScreen.height; | ||
|
|
||
| glfwSetWindowMonitor(platform.handle, NULL, prevPosX, prevPosY, prevWidth, prevHeight, 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, prevWidth, prevHeight); | ||
|
|
||
| // Refocus window | ||
| glfwFocusWindow(platform.handle); | ||
|
|
@@ -1302,12 +1335,15 @@ int InitPlatform(void) | |
| // Resize window content area based on the monitor content scale. | ||
| // NOTE: This hint only has an effect on platforms where screen coordinates and pixels always map 1:1 such as Windows and X11. | ||
| // On platforms like macOS the resolution of the framebuffer is changed independently of the window size. | ||
| // Scale content area based on the monitor content scale where window is placed on | ||
| glfwWindowHint(GLFW_SCALE_TO_MONITOR, GLFW_TRUE); // Only has effect on Windows and X11 | ||
| glfwWindowHint(GLFW_SCALE_FRAMEBUFFER, GLFW_TRUE); // Only has effect on MacOS and Wayland | ||
| } | ||
| else | ||
| { | ||
| glfwWindowHint(GLFW_SCALE_TO_MONITOR, GLFW_FALSE); | ||
| glfwWindowHint(GLFW_SCALE_FRAMEBUFFER, GLFW_FALSE); | ||
| } | ||
|
|
||
| // Mouse passthrough | ||
| if ((CORE.Window.flags & FLAG_WINDOW_MOUSE_PASSTHROUGH) > 0) glfwWindowHint(GLFW_MOUSE_PASSTHROUGH, GLFW_TRUE); | ||
|
|
@@ -1520,15 +1556,16 @@ int InitPlatform(void) | |
|
|
||
| if ((CORE.Window.flags & FLAG_WINDOW_HIGHDPI) > 0) | ||
| { | ||
| // NOTE: On APPLE and Wayland platforms system should manage window/input scaling and also framebuffer scaling. | ||
| // Framebuffer scaling should be activated with: glfwWindowHint(GLFW_SCALE_FRAMEBUFFER, GLFW_TRUE); | ||
| #if !defined(__APPLE__) && !defined(_GLFW_WAYLAND) | ||
| glfwGetFramebufferSize(platform.handle, &fbWidth, &fbHeight); | ||
|
|
||
| // Screen scaling matrix is required in case desired screen area is different from display area | ||
| CORE.Window.screenScale = MatrixScale((float)fbWidth/CORE.Window.screen.width, (float)fbHeight/CORE.Window.screen.height, 1.0f); | ||
|
|
||
| // Mouse input scaling for the new screen size | ||
| // TODO FIXME does Wayland requires mouse scaling too ? | ||
| SetMouseScale((float)CORE.Window.screen.width/fbWidth, (float)CORE.Window.screen.height/fbHeight); | ||
| #endif | ||
| } | ||
|
|
@@ -1666,13 +1703,23 @@ static void WindowSizeCallback(GLFWwindow *window, int width, int height) | |
| CORE.Window.currentFbo.height = height; | ||
| CORE.Window.resizedLastFrame = true; | ||
|
|
||
| #if defined(__APPLE__) || defined(_GLFW_WAYLAND) | ||
| CORE.Window.screen.width = width; | ||
| CORE.Window.screen.height = height; | ||
| #else | ||
| if ((CORE.Window.flags & FLAG_WINDOW_HIGHDPI) > 0) | ||
| { | ||
| Vector2 windowScaleDPI = GetWindowScaleDPI(); | ||
|
|
||
| CORE.Window.screen.width = (unsigned int)ceilf(width/windowScaleDPI.x); | ||
| CORE.Window.screen.height = (unsigned int)ceilf(height/windowScaleDPI.y); | ||
| } | ||
| else | ||
| { | ||
| CORE.Window.screen.width = width; | ||
| CORE.Window.screen.height = height; | ||
| } | ||
| #endif | ||
| // NOTE: Postprocessing texture is not scaled to new size | ||
| } | ||
|
|
||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We could add a flag here like
fullscreenChangePending = true;and in the main loop (after 1 frame) if this flag is true fullscreen is activated &fullscreenChangePending = false; (the same for borderless)This is not important right now I just wanted to add it for later ;)