From 7d1bf0a9fe9fff557f010a4b0b70d9e7a1f7bfc9 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <[EMAIL REDACTED]>
Date: Thu, 8 Dec 2022 17:01:18 -0800
Subject: [PATCH] Make sure the display list is up to date for window placement
(cherry picked from commit ab479b49611e8f34573509cfece7e159faa922d6)
---
src/video/SDL_sysvideo.h | 5 +++++
src/video/SDL_video.c | 5 +++++
src/video/windows/SDL_windowsvideo.c | 1 +
3 files changed, 11 insertions(+)
diff --git a/src/video/SDL_sysvideo.h b/src/video/SDL_sysvideo.h
index 29bad4ef86fe..3669696e7192 100644
--- a/src/video/SDL_sysvideo.h
+++ b/src/video/SDL_sysvideo.h
@@ -178,6 +178,11 @@ struct SDL_VideoDevice
* Display functions
*/
+ /*
+ * Refresh the display list
+ */
+ void (*RefreshDisplays)(_THIS);
+
/*
* Get the bounds of a display
*/
diff --git a/src/video/SDL_video.c b/src/video/SDL_video.c
index 04d78afed782..38971b7a9b19 100644
--- a/src/video/SDL_video.c
+++ b/src/video/SDL_video.c
@@ -1567,6 +1567,11 @@ SDL_CreateWindow(const char *title, int x, int y, int w, int h, Uint32 flags)
}
}
+ /* Make sure the display list is up to date for window placement */
+ if (_this->RefreshDisplays) {
+ _this->RefreshDisplays(_this);
+ }
+
/* ensure no more than one of these flags is set */
type_flags = flags & (SDL_WINDOW_UTILITY | SDL_WINDOW_TOOLTIP | SDL_WINDOW_POPUP_MENU);
if ((type_flags & (type_flags - 1)) != 0) {
diff --git a/src/video/windows/SDL_windowsvideo.c b/src/video/windows/SDL_windowsvideo.c
index 3d04db1dc2f6..f81b0c658a69 100644
--- a/src/video/windows/SDL_windowsvideo.c
+++ b/src/video/windows/SDL_windowsvideo.c
@@ -154,6 +154,7 @@ static SDL_VideoDevice *WIN_CreateDevice(void)
device->VideoInit = WIN_VideoInit;
device->VideoQuit = WIN_VideoQuit;
#if !defined(__XBOXONE__) && !defined(__XBOXSERIES__)
+ device->RefreshDisplays = WIN_RefreshDisplays;
device->GetDisplayBounds = WIN_GetDisplayBounds;
device->GetDisplayUsableBounds = WIN_GetDisplayUsableBounds;
device->GetDisplayDPI = WIN_GetDisplayDPI;