Skip to content
Permalink
Browse files

David MacCormack fixed a bug in window sizing with Windows menus

  • Loading branch information
slouken committed Jan 20, 2003
1 parent 5158ce2 commit 34342b6915e40e437a6287f09f8fb29e1c296be9
Showing with 14 additions and 2 deletions.
  1. +14 −2 src/video/wincommon/SDL_sysevents.c
@@ -396,6 +396,7 @@ LONG CALLBACK WinMessage(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
MINMAXINFO *info;
RECT size;
int x, y;
int style;
int width;
int height;

@@ -424,8 +425,19 @@ LONG CALLBACK WinMessage(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
size.bottom = 0;
size.right = 0;
}
AdjustWindowRect(&size, GetWindowLong(hwnd, GWL_STYLE),
FALSE);

/* DJM - according to the docs for GetMenu(), the
return value is undefined if hwnd is a child window.
Aparently it's too difficult for MS to check
inside their function, so I have to do it here.
*/
style = GetWindowLong(hwnd, GWL_STYLE);
AdjustWindowRect(
&size,
style,
style & WS_CHILDWINDOW ? FALSE
: GetMenu(hwnd) != NULL);

width = size.right - size.left;
height = size.bottom - size.top;

0 comments on commit 34342b6

Please sign in to comment.