Fixes traditional fullscreen hide for Mac OS >= 10.15

This commit is contained in:
Nathan Pearson 2022-01-11 06:23:10 -07:00
parent 62953c2057
commit a40ff85e1a

View File

@ -2302,7 +2302,7 @@ void _glfwPlatformSetCursor(_GLFWwindow* window, _GLFWcursor* cursor UNUSED)
bool _glfwPlatformIsFullscreen(_GLFWwindow* w, unsigned int flags) {
NSWindow *window = w->ns.object;
bool traditional = !(flags & 1);
if (traditional) { if(@available(macOS 11.0, *)) return w->ns.in_traditional_fullscreen; }
if (traditional) { if(@available(macOS 10.15, *)) return w->ns.in_traditional_fullscreen; }
NSWindowStyleMask sm = [window styleMask];
return sm & NSWindowStyleMaskFullScreen;
}
@ -2313,8 +2313,8 @@ bool _glfwPlatformToggleFullscreen(_GLFWwindow* w, unsigned int flags) {
bool traditional = !(flags & 1);
NSWindowStyleMask sm = [window styleMask];
if (traditional) {
if (@available(macOS 11.0, *)) {
// As of Big Turd NSWindowStyleMaskFullScreen is no longer useable
if (@available(macOS 10.15, *)) {
// Also no longer compatible after a minor release of macOS 10.15
if (!w->ns.in_traditional_fullscreen) {
w->ns.pre_full_screen_style_mask = sm;
[window setStyleMask: NSWindowStyleMaskBorderless];