From b7161c804322e34164db39578e6f1fe0b4e016c7 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Tue, 15 Mar 2011 21:44:56 -0700 Subject: [PATCH] Removed obsolete window positioning code. --- src/video/directfb/SDL_DirectFB_window.c | 22 ++-------------------- src/video/windows/SDL_windowswindow.c | 15 ++------------- 2 files changed, 4 insertions(+), 33 deletions(-) diff --git a/src/video/directfb/SDL_DirectFB_window.c b/src/video/directfb/SDL_DirectFB_window.c index 97070457d..11808fc47 100644 --- a/src/video/directfb/SDL_DirectFB_window.c +++ b/src/video/directfb/SDL_DirectFB_window.c @@ -62,26 +62,8 @@ DirectFB_CreateWindow(_THIS, SDL_Window * window) bshaped = 1; /* Fill the window description. */ - if (SDL_WINDOWPOS_ISCENTERED(window->x)) { - x = (dispdata->cw - window->w) / 2; - } else if (SDL_WINDOWPOS_ISUNDEFINED(window->x)) { - x = 0; - } else { - x = window->x; - } - - if (SDL_WINDOWPOS_ISCENTERED(window->y)) { - y = (dispdata->ch - window->h) / 2; - } else if (SDL_WINDOWPOS_ISUNDEFINED(window->y)) { - y = 0; - } else { - y = window->y; - } - - if (window->flags & SDL_WINDOW_FULLSCREEN) { - x = 0; - y = 0; - } + x = window->x; + y = window->y; DirectFB_WM_AdjustWindowLayout(window, window->flags, window->w, window->h); diff --git a/src/video/windows/SDL_windowswindow.c b/src/video/windows/SDL_windowswindow.c index 24005490c..7cb06180b 100644 --- a/src/video/windows/SDL_windowswindow.c +++ b/src/video/windows/SDL_windowswindow.c @@ -345,7 +345,6 @@ WIN_SetWindowPosition(_THIS, SDL_Window * window) SDL_VideoDisplay *display = SDL_GetDisplayForWindow(window); HWND hwnd = ((SDL_WindowData *) window->driverdata)->hwnd; RECT rect; - SDL_Rect bounds; DWORD style; HWND top; BOOL menu; @@ -371,18 +370,8 @@ WIN_SetWindowPosition(_THIS, SDL_Window * window) AdjustWindowRectEx(&rect, style, menu, 0); 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 { - x = window->x + rect.left; - } - if (SDL_WINDOWPOS_ISCENTERED(window->y)) { - y = bounds.y + (bounds.h - h) / 2; - } else { - y = window->y + rect.top; - } + x = window->x + rect.left; + y = window->y + rect.top; SetWindowPos(hwnd, top, x, y, 0, 0, (SWP_NOCOPYBITS | SWP_NOSIZE)); }