gitea/SDL3_fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cocoa: Don't re-enter a fullscreen space if leaving to enter an exclusive mode

Browse Source 
Doing so can leave the window in a weird, offset state.
This commit is contained in:
Frank Praznik
2025-08-04 22:07:24 -04:00
parent 293b8b9fd6
commit ee8f2861e7
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/video/SDL_video.c
View File

@@ -1927,11 +1927,15 @@ bool SDL_UpdateFullscreenMode(SDL_Window *window, SDL_FullscreenOp fullscreen, b
goto done; goto done;
} }
if (commit) { if (commit) {
bool skip_spaces_switch = false;
// If we're switching between a fullscreen Space and exclusive fullscreen, we need to get back to normal first. // If we're switching between a fullscreen Space and exclusive fullscreen, we need to get back to normal first.
if (fullscreen && Cocoa_IsWindowInFullscreenSpace(window) && !window->last_fullscreen_exclusive_display && window->fullscreen_exclusive) { if (fullscreen && Cocoa_IsWindowInFullscreenSpace(window) && !window->last_fullscreen_exclusive_display && window->fullscreen_exclusive) {
if (!Cocoa_SetWindowFullscreenSpace(window, false, true)) { if (!Cocoa_SetWindowFullscreenSpace(window, false, true)) {
goto error; goto error;
} }
// We just left spaces to go to an exclusive mode, so don't try to re-enter.
skip_spaces_switch = true;
} else if (fullscreen && window->last_fullscreen_exclusive_display && !window->fullscreen_exclusive) { } else if (fullscreen && window->last_fullscreen_exclusive_display && !window->fullscreen_exclusive) {
for (i = 0; i < _this->num_displays; ++i) { for (i = 0; i < _this->num_displays; ++i) {
SDL_VideoDisplay *last_display = _this->displays[i]; SDL_VideoDisplay *last_display = _this->displays[i];
@@ -1945,8 +1949,10 @@ bool SDL_UpdateFullscreenMode(SDL_Window *window, SDL_FullscreenOp fullscreen, b
} }
} }
if (Cocoa_SetWindowFullscreenSpace(window, !!fullscreen, syncHint)) { if (!skip_spaces_switch) {
goto done; if (Cocoa_SetWindowFullscreenSpace(window, !!fullscreen, syncHint)) {
goto done;
}
} }
} }
} }