geemili
/
SDL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed min/max window size handling for borderless resizable windows

Sam Lantinga 2018-02-08 18:07:14 -08:00
parent 4c2a444e3a
commit 7b50aee932
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/video/windows/SDL_windowsevents.c
View File

@ -697,8 +697,6 @@ WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
int w, h; int w, h;
int min_w, min_h; int min_w, min_h;
int max_w, max_h; int max_w, max_h;
int style;
BOOL menu;
BOOL constrain_max_size; BOOL constrain_max_size;
if (SDL_IsShapedWindow(data->window)) if (SDL_IsShapedWindow(data->window))
@ -731,21 +729,23 @@ WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
constrain_max_size = FALSE; constrain_max_size = FALSE;
} }
size.top = 0; if (!(SDL_GetWindowFlags(data->window) & SDL_WINDOW_BORDERLESS)) {
size.left = 0; LONG style = GetWindowLong(hwnd, GWL_STYLE);
size.bottom = h; /* DJM - according to the docs for GetMenu(), the
size.right = w; return value is undefined if hwnd is a child window.
Apparently it's too difficult for MS to check
inside their function, so I have to do it here.
*/
BOOL menu = (style & WS_CHILDWINDOW) ? FALSE : (GetMenu(hwnd) != NULL);
size.top = 0;
size.left = 0;
size.bottom = h;
size.right = w;
style = GetWindowLong(hwnd, GWL_STYLE); AdjustWindowRectEx(&size, style, menu, 0);
/* DJM - according to the docs for GetMenu(), the w = size.right - size.left;
return value is undefined if hwnd is a child window. h = size.bottom - size.top;
Apparently it's too difficult for MS to check }
inside their function, so I have to do it here.
*/
menu = (style & WS_CHILDWINDOW) ? FALSE : (GetMenu(hwnd) != NULL);
AdjustWindowRectEx(&size, style, menu, 0);
w = size.right - size.left;
h = size.bottom - size.top;
/* Fix our size to the current size */ /* Fix our size to the current size */
info = (MINMAXINFO *) lParam; info = (MINMAXINFO *) lParam;