mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-11-05 02:04:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

SDL_cocoawindow: Fix setting parent-relative coordinates for child windows in Cocoa_SetWindowSize

Browse Source
This commit is contained in:
Sam Lantinga
2024-05-31 15:29:19 -07:00
parent e3beaa1972
commit 4c7459eda8
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/video/cocoa/SDL_cocoawindow.m
View File

@@ -2313,14 +2313,16 @@ void Cocoa_SetWindowSize(SDL_VideoDevice *_this, SDL_Window *window)
/* isZoomed always returns true if the window is not resizable */ /* isZoomed always returns true if the window is not resizable */
if (!(window->flags & SDL_WINDOW_RESIZABLE) || !Cocoa_IsZoomed(window)) { if (!(window->flags & SDL_WINDOW_RESIZABLE) || !Cocoa_IsZoomed(window)) {
if (!(window->flags & SDL_WINDOW_FULLSCREEN)) { if (!(window->flags & SDL_WINDOW_FULLSCREEN)) {
NSRect rect = [nswindow contentRectForFrameRect:[nswindow frame]]; int x, y;
NSRect rect = [nswindow contentRectForFrameRect:[nswindow frame]];
/* Cocoa will resize the window from the bottom-left rather than the /* Cocoa will resize the window from the bottom-left rather than the
* top-left when -[nswindow setContentSize:] is used, so we must set the * top-left when -[nswindow setContentSize:] is used, so we must set the
* entire frame based on the new size, in order to preserve the position. * entire frame based on the new size, in order to preserve the position.
*/ */
rect.origin.x = window->floating.x; SDL_RelativeToGlobalForWindow(window, window->floating.x, window->floating.y, &x, &y);
rect.origin.y = window->floating.y; rect.origin.x = x;
rect.origin.y = y;
rect.size.width = window->floating.w; rect.size.width = window->floating.w;
rect.size.height = window->floating.h; rect.size.height = window->floating.h;
ConvertNSRect(&rect); ConvertNSRect(&rect);