gitea/SDL3_fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Popup window parent defaults to the first toplevel window"

Browse Source 
This reverts commit e8e2c8175c.

Conceptually tooltips and context menus always have parent windows
This commit is contained in:
Sam Lantinga
2023-03-14 14:53:54 -07:00
parent 969e0842e6
commit a17ad65f2b
1 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/video/SDL_video.c
View File

@@ -1939,28 +1939,12 @@ 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 */