mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-10-16 23:06:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added handling for undefined window position on X11

Browse Source
This commit is contained in:
Sam Lantinga
2023-02-24 17:49:45 -08:00
parent 3bfd596608
commit 4d9d343662
5 changed files with 38 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/video/windows/SDL_windowswindow.c
View File

@@ -498,41 +498,12 @@ int WIN_CreateWindow(_THIS, SDL_Window *window)
style |= GetWindowStyle(window);
/* Make sure we have valid coordinates for the AdjustWindowRect call below */
x = window->x;
y = window->y;
if (SDL_WINDOWPOS_ISUNDEFINED(x) || SDL_WINDOWPOS_ISUNDEFINED(y)) {
SDL_DisplayID displayID = 0;
SDL_Rect bounds;
if (SDL_WINDOWPOS_ISUNDEFINED(x) && (x & 0xFFFF)) {
displayID = (x & 0xFFFF);
} else if (SDL_WINDOWPOS_ISUNDEFINED(y) && (y & 0xFFFF)) {
displayID = (y & 0xFFFF);
}
if (displayID == 0 || SDL_GetDisplayIndex(displayID) < 0) {
displayID = SDL_GetPrimaryDisplay();
}
SDL_zero(bounds);
SDL_GetDisplayBounds(displayID, &bounds);
if (SDL_WINDOWPOS_ISUNDEFINED(x)) {
window->x = window->windowed.x = bounds.x + (bounds.w - window->w) / 2;
}
if (SDL_WINDOWPOS_ISUNDEFINED(y)) {
window->y = window->windowed.y = bounds.y + (bounds.h - window->h) / 2;
}
if (displayID == SDL_GetPrimaryDisplay() &&
SDL_WINDOWPOS_ISUNDEFINED(x) && SDL_WINDOWPOS_ISUNDEFINED(y)) {
/* We can use CW_USEDEFAULT for the position */
undefined_position = SDL_TRUE;
}
}
/* Figure out what the window area will be */
WIN_AdjustWindowRectWithStyle(window, style, FALSE, &x, &y, &w, &h, SDL_FALSE);
if (undefined_position) {
if (window->undefined_x && window->undefined_y &&
window->last_displayID == SDL_GetPrimaryDisplay()) {
undefined_position = SDL_TRUE;
x = CW_USEDEFAULT;
y = CW_USEDEFAULT; /* Not actually used */
}