Relintai/sdl2_frt
1
0
Fork 0
mirror of https://github.com/Relintai/sdl2_frt.git synced 2024-12-29 20:27:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed forcing the window size when creating a non-resizable window on Windows.

Browse Source
This commit is contained in:
Sam Lantinga 2015-10-01 11:21:06 -07:00
parent 667783ba88
commit 7bc72eaf84
1 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -109,7 +109,7 @@ WIN_SetWindowPositionInternal(_THIS, SDL_Window * window, UINT flags)
y = window->y + rect.top; y = window->y + rect.top;
data->expected_resize = SDL_TRUE; data->expected_resize = SDL_TRUE;
SetWindowPos( hwnd, top, x, y, w, h, flags ); SetWindowPos(hwnd, top, x, y, w, h, flags);
data->expected_resize = SDL_FALSE; data->expected_resize = SDL_FALSE;
} }
@ -165,7 +165,26 @@ SetupWindowData(_THIS, SDL_Window * window, HWND hwnd, SDL_bool created)
int h = rect.bottom; int h = rect.bottom;
if ((window->w && window->w != w) || (window->h && window->h != h)) { if ((window->w && window->w != w) || (window->h && window->h != h)) {
/* We tried to create a window larger than the desktop and Windows didn't allow it. Override! */ /* We tried to create a window larger than the desktop and Windows didn't allow it. Override! */
WIN_SetWindowPositionInternal(_this, window, SWP_NOCOPYBITS | SWP_NOZORDER | SWP_NOACTIVATE); RECT rect;
DWORD style;
BOOL menu;
int x, y;
int w, h;
/* Figure out what the window area will be */
style = GetWindowLong(hwnd, GWL_STYLE);
rect.left = 0;
rect.top = 0;
rect.right = window->w;
rect.bottom = window->h;
menu = (style & WS_CHILDWINDOW) ? FALSE : (GetMenu(hwnd) != NULL);
AdjustWindowRectEx(&rect, style, menu, 0);
w = (rect.right - rect.left);
h = (rect.bottom - rect.top);
x = window->x + rect.left;
y = window->y + rect.top;
SetWindowPos(hwnd, HWND_NOTOPMOST, x, y, w, h, SWP_NOCOPYBITS | SWP_NOZORDER | SWP_NOACTIVATE);
} else { } else {
window->w = w; window->w = w;
window->h = h; window->h = h;
@ -492,7 +511,7 @@ WIN_SetWindowBordered(_THIS, SDL_Window * window, SDL_bool bordered)
} }
data->in_border_change = SDL_TRUE; data->in_border_change = SDL_TRUE;
SetWindowLong( hwnd, GWL_STYLE, style ); SetWindowLong(hwnd, GWL_STYLE, style);
WIN_SetWindowPositionInternal(_this, window, SWP_NOCOPYBITS | SWP_FRAMECHANGED | SWP_NOZORDER | SWP_NOACTIVATE); WIN_SetWindowPositionInternal(_this, window, SWP_NOCOPYBITS | SWP_FRAMECHANGED | SWP_NOZORDER | SWP_NOACTIVATE);
data->in_border_change = SDL_FALSE; data->in_border_change = SDL_FALSE;
} }