Mercurial > sdl-ios-xcode
diff src/video/windx5/SDL_dx5video.c @ 1705:fc731a7d83ed SDL-1.3
Merged fix for bug #258 from SDL 1.2
| author | Sam Lantinga <slouken@libsdl.org> |
|---|---|
| date | Sat, 24 Jun 2006 04:31:42 +0000 |
| parents | 4da1ee79c9af |
| children |
line wrap: on
line diff
--- a/src/video/windx5/SDL_dx5video.c Sat Jun 24 03:43:21 2006 +0000 +++ b/src/video/windx5/SDL_dx5video.c Sat Jun 24 04:31:42 2006 +0000 @@ -1225,9 +1225,8 @@ bounds.top = SDL_windowY; bounds.right = SDL_windowX + video->w; bounds.bottom = SDL_windowY + video->h; - AdjustWindowRectEx(&bounds, - GetWindowLong(SDL_Window, GWL_STYLE), - FALSE, 0); + AdjustWindowRectEx(&bounds, GetWindowLong(SDL_Window, GWL_STYLE), + (GetMenu(SDL_Window) != NULL), 0); width = bounds.right - bounds.left; height = bounds.bottom - bounds.top; if ((flags & SDL_FULLSCREEN)) { @@ -1315,10 +1314,10 @@ bounds.right = GetSystemMetrics(SM_CXSCREEN); bounds.bottom = GetSystemMetrics(SM_CYSCREEN); AdjustWindowRectEx(&bounds, GetWindowLong(SDL_Window, GWL_STYLE), - FALSE, 0); + (GetMenu(SDL_Window) != NULL), 0); SetWindowPos(SDL_Window, HWND_TOPMOST, bounds.left, bounds.top, - bounds.right - bounds.left, - bounds.bottom - bounds.top, SWP_NOCOPYBITS); + bounds.right - bounds.left, bounds.bottom - bounds.top, + SWP_NOCOPYBITS); ShowWindow(SDL_Window, SW_SHOW); while (GetForegroundWindow() != SDL_Window) { SetForegroundWindow(SDL_Window); @@ -1635,9 +1634,8 @@ bounds.top = SDL_windowY; bounds.right = SDL_windowX + video->w; bounds.bottom = SDL_windowY + video->h; - AdjustWindowRectEx(&bounds, - GetWindowLong(SDL_Window, GWL_STYLE), - FALSE, 0); + AdjustWindowRectEx(&bounds, GetWindowLong(SDL_Window, GWL_STYLE), + (GetMenu(SDL_Window) != NULL), 0); width = bounds.right - bounds.left; height = bounds.bottom - bounds.top; if (center) {