mirror
/
SDL
mirror of https://github.com/libsdl-org/SDL.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

video: Apply cleared flag states when restoring hidden windows 

Hiding a window and then clearing the minimized, maximized, fullscreen, or grabbed flags wouldn't result in the new state being applied to the window when shown, as the pending flags would always be zero, resulting in the flag application function never being entered. Calling SDL_RestoreWindow() didn't result in the minimized or maximized state being cleared on the hidden window either.

Save the current window flags to the pending flags when hiding a window, and universally apply the pending flags when the window is shown again to ensure that all state that was set or cleared when the window was hidden is applied. Any pending flags that match the existing window flags will be automatically deduplicated by the corresponding functions.
This commit is contained in:
Frank Praznik 2023-06-07 15:04:49 -04:00
parent 49b5cfa6c5
commit e15da1985a
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/video/SDL_video.c
View File

@ -1747,9 +1747,12 @@ static void ApplyWindowFlags(SDL_Window *window, Uint32 flags)
if (flags & SDL_WINDOW_MINIMIZED) {
SDL_MinimizeWindow(window);
}
if (flags & SDL_WINDOW_FULLSCREEN) {
SDL_SetWindowFullscreen(window, SDL_TRUE);
if (!(flags & (SDL_WINDOW_MINIMIZED | SDL_WINDOW_MAXIMIZED))) {
SDL_RestoreWindow(window);
}
SDL_SetWindowFullscreen(window, (flags & SDL_WINDOW_FULLSCREEN) != 0);
if (flags & SDL_WINDOW_MOUSE_GRABBED) {
/* We must specifically call SDL_SetWindowGrab() and not
SDL_SetWindowMouseGrab() here because older applications may use
@ -2785,10 +2788,8 @@ int SDL_ShowWindow(SDL_Window *window)
SDL_SendWindowEvent(window, SDL_EVENT_WINDOW_SHOWN, 0, 0);
/* Set window state if we have pending window flags cached */
if (window->pending_flags) {
ApplyWindowFlags(window, window->pending_flags);
window->pending_flags = 0;
}
ApplyWindowFlags(window, window->pending_flags);
window->pending_flags = 0;
/* Restore child windows */
for (child = window->first_child; child != NULL; child = child->next_sibling) {
@ -2820,6 +2821,9 @@ int SDL_HideWindow(SDL_Window *window)
child->restore_on_show = SDL_TRUE;
}
/* Store the flags for restoration later. */
window->pending_flags = window->flags;
window->is_hiding = SDL_TRUE;
if (_this->HideWindow) {
_this->HideWindow(_this, window);
@ -2909,6 +2913,11 @@ int SDL_RestoreWindow(SDL_Window *window)
return 0;
}
if (window->flags & SDL_WINDOW_HIDDEN) {
window->pending_flags &= ~(SDL_WINDOW_MAXIMIZED | SDL_WINDOW_MINIMIZED);
return 0;
}
if (_this->RestoreWindow) {
_this->RestoreWindow(_this, window);
}