|
@@ -1793,10 +1793,15 @@ Cocoa_SetWindowFullscreen(_THIS, SDL_Window * window, SDL_VideoDisplay * display
|
|
|
rect.size.height = bounds.h;
|
|
|
ConvertNSRect([nswindow screen], fullscreen, &rect);
|
|
|
|
|
|
- /* Hack to fix origin on Mac OS X 10.4 */
|
|
|
- NSRect screenRect = [[nswindow screen] frame];
|
|
|
- if (screenRect.size.height >= 1.0f) {
|
|
|
- rect.origin.y += (screenRect.size.height - rect.size.height);
|
|
|
+ /* Hack to fix origin on Mac OS X 10.4
|
|
|
+ This is no longer needed as of Mac OS X 10.15, according to bug 4822.
|
|
|
+ */
|
|
|
+ NSOperatingSystemVersion version = [[NSProcessInfo processInfo] operatingSystemVersion];
|
|
|
+ if ((version.majorVersion == 10) && (version.minorVersion < 15)) {
|
|
|
+ NSRect screenRect = [[nswindow screen] frame];
|
|
|
+ if (screenRect.size.height >= 1.0f) {
|
|
|
+ rect.origin.y += (screenRect.size.height - rect.size.height);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
[nswindow setStyleMask:NSWindowStyleMaskBorderless];
|