Simplified Windows window creation.
This commit is contained in:
parent
9da77abd36
commit
0f6925189c
1 changed files with 6 additions and 29 deletions
|
@ -194,7 +194,6 @@ 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;
|
||||
|
@ -202,38 +201,16 @@ WIN_CreateWindow(_THIS, SDL_Window * window)
|
|||
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);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue