Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

The window position is display relative, at least for now...

  • Loading branch information
slouken committed Dec 6, 2009
1 parent 0d71b13 commit 3e5f8f1bbfea544d9510e7f8d1b6af238c7a96e1
Showing with 19 additions and 13 deletions.
  1. +10 −7 src/video/cocoa/SDL_cocoawindow.m
  2. +9 −6 src/video/win32/SDL_win32window.c
@@ -298,7 +298,8 @@ - (BOOL)canBecomeMainWindow
{
NSAutoreleasePool *pool;
SDL_VideoData *videodata = (SDL_VideoData *) _this->driverdata;
SDL_DisplayData *displaydata = (SDL_DisplayData *) SDL_GetDisplayFromWindow(window)->driverdata;
SDL_VideoDisplay *display = SDL_GetDisplayFromWindow(window);
SDL_DisplayData *displaydata = (SDL_DisplayData *) display->driverdata;
SDL_WindowData *data;

/* Allocate the window data */
@@ -321,10 +322,12 @@ - (BOOL)canBecomeMainWindow

/* Fill in the SDL window with the window data */
{
SDL_Rect bounds;
NSRect rect = [nswindow contentRectForFrameRect:[nswindow frame]];
ConvertNSRect(&rect);
window->x = (int)rect.origin.x;
window->y = (int)rect.origin.y;
Cocoa_GetDisplayBounds(_this, display, &bounds);
window->x = (int)rect.origin.x - bounds.x;
window->y = (int)rect.origin.y - bounds.y;
window->w = (int)rect.size.width;
window->h = (int)rect.size.height;
}
@@ -392,15 +395,15 @@ - (BOOL)canBecomeMainWindow
} else if (window->x == SDL_WINDOWPOS_UNDEFINED) {
rect.origin.x = bounds.x;
} else {
rect.origin.x = window->x;
rect.origin.x = bounds.x + window->x;
}
if ((window->flags & SDL_WINDOW_FULLSCREEN)
|| window->y == SDL_WINDOWPOS_CENTERED) {
rect.origin.y = bounds.y + (bounds.h - window->h) / 2;
} else if (window->x == SDL_WINDOWPOS_UNDEFINED) {
rect.origin.y = bounds.y;
} else {
rect.origin.y = window->y;
rect.origin.y = bounds.y + window->y;
}
rect.size.width = window->w;
rect.size.height = window->h;
@@ -496,13 +499,13 @@ - (BOOL)canBecomeMainWindow
|| window->x == SDL_WINDOWPOS_CENTERED) {
rect.origin.x = bounds.x + (bounds.w - window->w) / 2;
} else {
rect.origin.x = window->x;
rect.origin.x = bounds.x + window->x;
}
if ((window->flags & SDL_WINDOW_FULLSCREEN)
|| window->y == SDL_WINDOWPOS_CENTERED) {
rect.origin.y = bounds.y + (bounds.h - window->h) / 2;
} else {
rect.origin.y = window->y;
rect.origin.y = bounds.y + window->y;
}
rect.size.width = window->w;
rect.size.height = window->h;
@@ -86,6 +86,7 @@ static int
SetupWindowData(_THIS, SDL_Window * window, HWND hwnd, SDL_bool created)
{
SDL_VideoData *videodata = (SDL_VideoData *) _this->driverdata;
SDL_VideoDisplay *display = SDL_GetDisplayFromWindow(window);
SDL_WindowData *data;

/* Allocate the window data */
@@ -123,8 +124,10 @@ SetupWindowData(_THIS, SDL_Window * window, HWND hwnd, SDL_bool created)
point.x = 0;
point.y = 0;
if (ClientToScreen(hwnd, &point)) {
window->x = point.x;
window->y = point.y;
SDL_Rect bounds;
WIN_GetDisplayBounds(_this, display, &bounds);
window->x = point.x - bounds.x;
window->y = point.y - bounds.y;
}
}
{
@@ -232,7 +235,7 @@ WIN_CreateWindow(_THIS, SDL_Window * window)
x = bounds.x;
}
} else {
x = window->x + rect.left;
x = bounds.x + window->x + rect.left;
}
if ((window->flags & SDL_WINDOW_FULLSCREEN)
|| window->y == SDL_WINDOWPOS_CENTERED) {
@@ -244,7 +247,7 @@ WIN_CreateWindow(_THIS, SDL_Window * window)
y = bounds.y;
}
} else {
y = window->y + rect.top;
y = bounds.y + window->y + rect.top;
}

hwnd =
@@ -459,13 +462,13 @@ WIN_SetWindowPosition(_THIS, SDL_Window * window)
|| window->x == SDL_WINDOWPOS_CENTERED) {
x = bounds.x + (bounds.w - window->w) / 2;
} else {
x = window->x + rect.left;
x = bounds.x + window->x + rect.left;
}
if ((window->flags & SDL_WINDOW_FULLSCREEN)
|| window->y == SDL_WINDOWPOS_CENTERED) {
y = bounds.y + (bounds.h - window->h) / 2;
} else {
y = window->y + rect.top;
y = bounds.y + window->y + rect.top;
}

SetWindowPos(hwnd, top, x, y, 0, 0, (SWP_NOCOPYBITS | SWP_NOSIZE));

0 comments on commit 3e5f8f1

Please sign in to comment.