encounter/SDL
1
0
Fork 0
mirror of https://github.com/encounter/SDL.git synced 2025-12-08 21:17:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed restoring window size when coming out of fullscreen desktop mode.

Browse Source 
Use the style of the window as it will be, not as it currently is at the
time of the AdjustWindowRect call.
This commit is contained in:
Sam Lantinga
2017-10-06 21:43:59 -07:00
parent e9652b1987
commit 1bfe6d6026
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/video/windows/SDL_windowswindow.c
View File

@@ -595,6 +595,8 @@ WIN_SetWindowFullscreen(_THIS, SDL_Window * window, SDL_VideoDisplay * display,
style &= ~WS_MAXIMIZE;
}
} else {
BOOL menu;
/* Restore window-maximization state, as applicable.
Special care is taken to *not* do this if and when we're
alt-tab'ing away (to some other window; as indicated by
@@ -606,7 +608,8 @@ WIN_SetWindowFullscreen(_THIS, SDL_Window * window, SDL_VideoDisplay * display,
data->windowed_mode_was_maximized = SDL_FALSE;
}
WIN_AdjustWindowRect(window, &x, &y, &w, &h, SDL_FALSE);
menu = (style & WS_CHILDWINDOW) ? FALSE : (GetMenu(hwnd) != NULL);
WIN_AdjustWindowRectWithStyle(window, style, menu, &x, &y, &w, &h, SDL_FALSE);
}
SetWindowLong(hwnd, GWL_STYLE, style);
data->expected_resize = SDL_TRUE;