mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-12-28 00:54:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

cocoa: Use cached viewport dimensions when querying the window pixel size

Browse Source 
Recalculate the backing viewport dimensions in the resize handler, otherwise, this data can be out-of-sync with the logical window size if queried during transition animations.
This commit is contained in:
Frank Praznik
2025-11-03 09:13:28 -05:00
parent 97e2951875
commit 05ce978e18
2 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/video/cocoa/SDL_cocoawindow.h
View File

@@ -141,6 +141,7 @@ typedef enum
@property(nonatomic) SDL_Window *window;
@property(nonatomic) NSWindow *nswindow;
@property(nonatomic) NSView *sdlContentView;
@property(nonatomic) NSRect viewport;
@property(nonatomic) NSMutableArray *nscontexts;
@property(nonatomic) BOOL in_blocking_transition;
@property(nonatomic) BOOL fullscreen_space_requested;

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

@@ -1242,6 +1242,12 @@ static NSCursor *Cocoa_GetDesiredCursor(void)
w = (int)rect.size.width;
h = (int)rect.size.height;
_data.viewport = [_data.sdlContentView bounds];
if (window->flags & SDL_WINDOW_HIGH_PIXEL_DENSITY) {
// This gives us the correct viewport for a Retina-enabled view.
_data.viewport = [_data.sdlContentView convertRectToBacking:_data.viewport];
}
ScheduleContextUpdates(_data);
/* The OS can resize the window automatically if the display density
@@ -2274,6 +2280,12 @@ static bool SetupWindowData(SDL_VideoDevice *_this, SDL_Window *window, NSWindow
data.nscontexts = [[NSMutableArray alloc] init];
data.sdlContentView = nsview;
data.viewport = [data.sdlContentView bounds];
if (window->flags & SDL_WINDOW_HIGH_PIXEL_DENSITY) {
// This gives us the correct viewport for a Retina-enabled view.
data.viewport = [data.sdlContentView convertRectToBacking:data.viewport];
}
// Create an event listener for the window
data.listener = [[SDL3Cocoa_WindowListener alloc] init];
@@ -2703,16 +2715,9 @@ void Cocoa_GetWindowSizeInPixels(SDL_VideoDevice *_this, SDL_Window *window, int
{
@autoreleasepool {
SDL_CocoaWindowData *windata = (__bridge SDL_CocoaWindowData *)window->internal;
NSView *contentView = windata.sdlContentView;
NSRect viewport = [contentView bounds];
if (window->flags & SDL_WINDOW_HIGH_PIXEL_DENSITY) {
// This gives us the correct viewport for a Retina-enabled view.
viewport = [contentView convertRectToBacking:viewport];
}
*w = (int)viewport.size.width;
*h = (int)viewport.size.height;
*w = (int)windata.viewport.size.width;
*h = (int)windata.viewport.size.height;
}
}