Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Simplified Windows window creation.
- Loading branch information
Showing
with
6 additions
and
29 deletions.
-
+6
−29
src/video/windows/SDL_windowswindow.c
|
@@ -194,46 +194,23 @@ WIN_CreateWindow(_THIS, SDL_Window * window) |
|
|
SDL_VideoDisplay *display = SDL_GetDisplayForWindow(window); |
|
|
HWND hwnd; |
|
|
RECT rect; |
|
|
SDL_Rect bounds; |
|
|
DWORD style = STYLE_BASIC; |
|
|
int x, y; |
|
|
int w, h; |
|
|
|
|
|
style |= GetWindowStyle(window); |
|
|
|
|
|
/* Figure out what the window area will be */ |
|
|
rect.left = 0; |
|
|
rect.top = 0; |
|
|
rect.right = window->w; |
|
|
rect.bottom = window->h; |
|
|
rect.left = window->x; |
|
|
rect.top = window->y; |
|
|
rect.right = window->x + window->w; |
|
|
rect.bottom = window->y + window->h; |
|
|
AdjustWindowRectEx(&rect, style, FALSE, 0); |
|
|
x = rect.left; |
|
|
y = rect.top; |
|
|
w = (rect.right - rect.left); |
|
|
h = (rect.bottom - rect.top); |
|
|
|
|
|
WIN_GetDisplayBounds(_this, display, &bounds); |
|
|
if (SDL_WINDOWPOS_ISCENTERED(window->x)) { |
|
|
x = bounds.x + (bounds.w - w) / 2; |
|
|
} else if (SDL_WINDOWPOS_ISUNDEFINED(window->x)) { |
|
|
if (bounds.x == 0) { |
|
|
x = CW_USEDEFAULT; |
|
|
} else { |
|
|
x = bounds.x; |
|
|
} |
|
|
} else { |
|
|
x = window->x + rect.left; |
|
|
} |
|
|
if (SDL_WINDOWPOS_ISCENTERED(window->y)) { |
|
|
y = bounds.y + (bounds.h - h) / 2; |
|
|
} else if (SDL_WINDOWPOS_ISUNDEFINED(window->x)) { |
|
|
if (bounds.x == 0) { |
|
|
y = CW_USEDEFAULT; |
|
|
} else { |
|
|
y = bounds.y; |
|
|
} |
|
|
} else { |
|
|
y = window->y + rect.top; |
|
|
} |
|
|
|
|
|
hwnd = |
|
|
CreateWindow(SDL_Appname, TEXT(""), style, x, y, w, h, NULL, NULL, |
|
|
SDL_Instance, NULL); |
|
|