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

You can move fullscreen desktop windows between displays using SDL_SetWindowPosition()

Browse Source
This commit is contained in:
Sam Lantinga
2023-02-16 17:28:56 -08:00
parent 64b88115ec
commit 630c23ce17
1 changed files with 29 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/video/SDL_video.c
View File

@@ -2145,8 +2145,12 @@ void *SDL_GetWindowData(SDL_Window *window, const char *name)
int SDL_SetWindowPosition(SDL_Window *window, int x, int y) int SDL_SetWindowPosition(SDL_Window *window, int x, int y)
{ {
SDL_DisplayID original_displayID;
CHECK_WINDOW_MAGIC(window, -1); CHECK_WINDOW_MAGIC(window, -1);
original_displayID = SDL_GetDisplayForWindow(window);
if (SDL_WINDOWPOS_ISUNDEFINED(x)) { if (SDL_WINDOWPOS_ISUNDEFINED(x)) {
x = window->windowed.x; x = window->windowed.x;
} }
@@ -2154,7 +2158,7 @@ int SDL_SetWindowPosition(SDL_Window *window, int x, int y)
y = window->windowed.y; y = window->windowed.y;
} }
if (SDL_WINDOWPOS_ISCENTERED(x) || SDL_WINDOWPOS_ISCENTERED(y)) { if (SDL_WINDOWPOS_ISCENTERED(x) || SDL_WINDOWPOS_ISCENTERED(y)) {
SDL_DisplayID displayID = SDL_GetDisplayForWindow(window); SDL_DisplayID displayID = original_displayID;
SDL_Rect bounds; SDL_Rect bounds;
if (SDL_WINDOWPOS_ISCENTERED(x) && (x & 0xFFFF)) { if (SDL_WINDOWPOS_ISCENTERED(x) && (x & 0xFFFF)) {
@@ -2179,7 +2183,30 @@ int SDL_SetWindowPosition(SDL_Window *window, int x, int y)
window->windowed.x = x; window->windowed.x = x;
window->windowed.y = y; window->windowed.y = y;
if (!SDL_WINDOW_FULLSCREEN_VISIBLE(window)) { if (SDL_WINDOW_FULLSCREEN_VISIBLE(window)) {
if (!window->fullscreen_exclusive) {
/* See if we should move to another display */
SDL_DisplayID displayID = GetDisplayForRect(x, y, 1, 1);
if (displayID != original_displayID) {
SDL_Rect bounds;
SDL_zero(bounds);
SDL_GetDisplayBounds(displayID, &bounds);
window->x = bounds.x;
window->y = bounds.y;
window->w = bounds.w;
window->w = bounds.w;
if (_this->SetWindowPosition) {
_this->SetWindowPosition(_this, window);
}
if (_this->SetWindowSize) {
_this->SetWindowSize(_this, window);
}
}
}
} else {
window->x = x; window->x = x;
window->y = y; window->y = y;