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

Popup window parent defaults to the first toplevel window

Browse Source
This commit is contained in:
Sam Lantinga
2023-03-14 11:42:58 -07:00
parent 3951cae4a5
commit e8e2c8175c
1 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/video/SDL_video.c
View File

@@ -1939,12 +1939,28 @@ SDL_Window *SDL_CreateWindow(const char *title, int w, int h, Uint32 flags)
SDL_Window *SDL_CreatePopupWindow(SDL_Window *parent, int offset_x, int offset_y, int w, int h, Uint32 flags) SDL_Window *SDL_CreatePopupWindow(SDL_Window *parent, int offset_x, int offset_y, int w, int h, Uint32 flags)
{ {
if (!_this) {
SDL_UninitializedVideo();
return NULL;
}
if (!(_this->quirk_flags & VIDEO_DEVICE_QUIRK_HAS_POPUP_WINDOW_SUPPORT)) { if (!(_this->quirk_flags & VIDEO_DEVICE_QUIRK_HAS_POPUP_WINDOW_SUPPORT)) {
SDL_Unsupported(); SDL_Unsupported();
return NULL; return NULL;
} }
/* Parent must be a valid window */ /* Parent must be a valid window */
if (!parent) {
/* Use the first toplevel window by default */
for (parent = _this->windows; parent; parent = parent->next) {
if (!SDL_WINDOW_IS_POPUP(parent)) {
/* Adjust the offset to be relative to this window */
offset_x -= parent->x;
offset_y -= parent->y;
break;
}
}
}
CHECK_WINDOW_MAGIC(parent, NULL); CHECK_WINDOW_MAGIC(parent, NULL);
/* Popups must specify either the tooltip or popup menu window flags */ /* Popups must specify either the tooltip or popup menu window flags */