Commit 7bc72eaf84692c293f44148a8c17952e34ec0fd7
2015-10-01T11:21:06
Fixed forcing the window size when creating a non-resizable window on Windows.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50
diff --git a/src/video/windows/SDL_windowswindow.c b/src/video/windows/SDL_windowswindow.c
index 2dc5386..a1fb020 100644
--- a/src/video/windows/SDL_windowswindow.c
+++ b/src/video/windows/SDL_windowswindow.c
@@ -109,7 +109,7 @@ WIN_SetWindowPositionInternal(_THIS, SDL_Window * window, UINT flags)
y = window->y + rect.top;
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;
}
@@ -165,7 +165,26 @@ SetupWindowData(_THIS, SDL_Window * window, HWND hwnd, SDL_bool created)
int h = rect.bottom;
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! */
- 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 {
window->w = w;
window->h = h;
@@ -492,7 +511,7 @@ WIN_SetWindowBordered(_THIS, SDL_Window * window, SDL_bool bordered)
}
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);
data->in_border_change = SDL_FALSE;
}