Commit 0f692518 authored by Sam Lantinga's avatar Sam Lantinga

Simplified Windows window creation.

parent 9da77abd
...@@ -194,7 +194,6 @@ WIN_CreateWindow(_THIS, SDL_Window * window) ...@@ -194,7 +194,6 @@ WIN_CreateWindow(_THIS, SDL_Window * window)
SDL_VideoDisplay *display = SDL_GetDisplayForWindow(window); SDL_VideoDisplay *display = SDL_GetDisplayForWindow(window);
HWND hwnd; HWND hwnd;
RECT rect; RECT rect;
SDL_Rect bounds;
DWORD style = STYLE_BASIC; DWORD style = STYLE_BASIC;
int x, y; int x, y;
int w, h; int w, h;
...@@ -202,38 +201,16 @@ WIN_CreateWindow(_THIS, SDL_Window * window) ...@@ -202,38 +201,16 @@ WIN_CreateWindow(_THIS, SDL_Window * window)
style |= GetWindowStyle(window); style |= GetWindowStyle(window);
/* Figure out what the window area will be */ /* Figure out what the window area will be */
rect.left = 0; rect.left = window->x;
rect.top = 0; rect.top = window->y;
rect.right = window->w; rect.right = window->x + window->w;
rect.bottom = window->h; rect.bottom = window->y + window->h;
AdjustWindowRectEx(&rect, style, FALSE, 0); AdjustWindowRectEx(&rect, style, FALSE, 0);
x = rect.left;
y = rect.top;
w = (rect.right - rect.left); w = (rect.right - rect.left);
h = (rect.bottom - rect.top); 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 = hwnd =
CreateWindow(SDL_Appname, TEXT(""), style, x, y, w, h, NULL, NULL, CreateWindow(SDL_Appname, TEXT(""), style, x, y, w, h, NULL, NULL,
SDL_Instance, NULL); SDL_Instance, NULL);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment