mirror
/
SDL
mirror of https://github.com/libsdl-org/SDL.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

cocoa: fixed resizing windows with fixed aspect ratio 

The existing algorithm works well for min-max ratios, but didn't allow edge expansion of fixed aspect ratio windows. Use NSWindow setContentAspectRatio instead.
This commit is contained in:
Sam Lantinga 2025-01-15 09:36:55 -08:00
parent 67382e9c83
commit 1995471927
3 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/video/cocoa/SDL_cocoavideo.m
View File

@ -103,6 +103,7 @@ static SDL_VideoDevice *Cocoa_CreateDevice(void)
device->SetWindowSize = Cocoa_SetWindowSize; device->SetWindowSize = Cocoa_SetWindowSize;
device->SetWindowMinimumSize = Cocoa_SetWindowMinimumSize; device->SetWindowMinimumSize = Cocoa_SetWindowMinimumSize;
device->SetWindowMaximumSize = Cocoa_SetWindowMaximumSize; device->SetWindowMaximumSize = Cocoa_SetWindowMaximumSize;
device->SetWindowAspectRatio = Cocoa_SetWindowAspectRatio;
device->SetWindowOpacity = Cocoa_SetWindowOpacity; device->SetWindowOpacity = Cocoa_SetWindowOpacity;
device->GetWindowSizeInPixels = Cocoa_GetWindowSizeInPixels; device->GetWindowSizeInPixels = Cocoa_GetWindowSizeInPixels;
device->ShowWindow = Cocoa_ShowWindow; device->ShowWindow = Cocoa_ShowWindow;

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

@ -168,6 +168,7 @@ extern bool Cocoa_SetWindowPosition(SDL_VideoDevice *_this, SDL_Window *window);
extern void Cocoa_SetWindowSize(SDL_VideoDevice *_this, SDL_Window *window); extern void Cocoa_SetWindowSize(SDL_VideoDevice *_this, SDL_Window *window);
extern void Cocoa_SetWindowMinimumSize(SDL_VideoDevice *_this, SDL_Window *window); extern void Cocoa_SetWindowMinimumSize(SDL_VideoDevice *_this, SDL_Window *window);
extern void Cocoa_SetWindowMaximumSize(SDL_VideoDevice *_this, SDL_Window *window); extern void Cocoa_SetWindowMaximumSize(SDL_VideoDevice *_this, SDL_Window *window);
extern void Cocoa_SetWindowAspectRatio(SDL_VideoDevice *_this, SDL_Window *window);
extern void Cocoa_GetWindowSizeInPixels(SDL_VideoDevice *_this, SDL_Window *window, int *w, int *h); extern void Cocoa_GetWindowSizeInPixels(SDL_VideoDevice *_this, SDL_Window *window, int *w, int *h);
extern bool Cocoa_SetWindowOpacity(SDL_VideoDevice *_this, SDL_Window *window, float opacity); extern bool Cocoa_SetWindowOpacity(SDL_VideoDevice *_this, SDL_Window *window, float opacity);
extern void Cocoa_ShowWindow(SDL_VideoDevice *_this, SDL_Window *window); extern void Cocoa_ShowWindow(SDL_VideoDevice *_this, SDL_Window *window);

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

@ -1109,7 +1109,7 @@ static NSCursor *Cocoa_GetDesiredCursor(void)
{ {
SDL_Window *window = _data.window; SDL_Window *window = _data.window;
if (window->min_aspect > 0.0f || window->max_aspect > 0.0f) { if (window->min_aspect != window->max_aspect) {
NSWindow *nswindow = _data.nswindow; NSWindow *nswindow = _data.nswindow;
NSRect newContentRect = [nswindow contentRectForFrameRect:NSMakeRect(0, 0, frameSize.width, frameSize.height)]; NSRect newContentRect = [nswindow contentRectForFrameRect:NSMakeRect(0, 0, frameSize.width, frameSize.height)];
NSSize newSize = newContentRect.size; NSSize newSize = newContentRect.size;
@ -1121,9 +1121,9 @@ static NSCursor *Cocoa_GetDesiredCursor(void)
aspectRatio = newSize.width / newSize.height; aspectRatio = newSize.width / newSize.height;
if (maxAspectRatio > 0.0f && aspectRatio > maxAspectRatio) { if (maxAspectRatio > 0.0f && aspectRatio > maxAspectRatio) {
newSize.width = (int)SDL_roundf(newSize.height * maxAspectRatio); newSize.width = SDL_roundf(newSize.height * maxAspectRatio);
} else if (minAspectRatio > 0.0f && aspectRatio < minAspectRatio) { } else if (minAspectRatio > 0.0f && aspectRatio < minAspectRatio) {
newSize.height = (int)SDL_roundf(newSize.width / minAspectRatio); newSize.height = SDL_roundf(newSize.width / minAspectRatio);
} }
NSRect newFrameRect = [nswindow frameRectForContentRect:NSMakeRect(0, 0, newSize.width, newSize.height)]; NSRect newFrameRect = [nswindow frameRectForContentRect:NSMakeRect(0, 0, newSize.width, newSize.height)];
@ -2515,6 +2515,21 @@ void Cocoa_SetWindowMaximumSize(SDL_VideoDevice *_this, SDL_Window *window)
} }
} }
void Cocoa_SetWindowAspectRatio(SDL_VideoDevice *_this, SDL_Window *window)
{
@autoreleasepool {
SDL_CocoaWindowData *windata = (__bridge SDL_CocoaWindowData *)window->internal;
if (window->min_aspect > 0.0f && window->min_aspect == window->max_aspect) {
int numerator = 0, denominator = 1;
SDL_CalculateFraction(window->max_aspect, &numerator, &denominator);
[windata.nswindow setContentAspectRatio:NSMakeSize(numerator, denominator)];
} else {
[windata.nswindow setContentAspectRatio:NSMakeSize(0, 0)];
}
}
}
void Cocoa_GetWindowSizeInPixels(SDL_VideoDevice *_this, SDL_Window *window, int *w, int *h) void Cocoa_GetWindowSizeInPixels(SDL_VideoDevice *_this, SDL_Window *window, int *w, int *h)
{ {
@autoreleasepool { @autoreleasepool {