From 82b9a1266c9f008451edca0e938bfae30734061d Mon Sep 17 00:00:00 2001
From: rdb <git@rdb.name>
Date: Mon, 16 Sep 2024 13:29:01 +0200
Subject: [PATCH] cocoa: Fix error when switching to FS while macOS' FS is
 active

---
 panda/src/cocoadisplay/cocoaGraphicsWindow.mm | 31 +++++++++----------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/panda/src/cocoadisplay/cocoaGraphicsWindow.mm b/panda/src/cocoadisplay/cocoaGraphicsWindow.mm
index f0388a7ada..acf1fec0a9 100644
--- a/panda/src/cocoadisplay/cocoaGraphicsWindow.mm
+++ b/panda/src/cocoadisplay/cocoaGraphicsWindow.mm
@@ -858,7 +858,7 @@ set_properties_now(WindowProperties &properties) {
                 [_window setLevel: NSNormalWindowLevel];
               }
               if ([_window respondsToSelector:@selector(setStyleMask:)]) {
-                [_window setStyleMask:NSBorderlessWindowMask];
+                [_window setStyleMask:([_window styleMask] & NSFullScreenWindowMask)];
               }
               [_window makeFirstResponder:_view];
               [_window setLevel:CGShieldingWindowLevel()];
@@ -897,7 +897,7 @@ set_properties_now(WindowProperties &properties) {
             // For some reason, setting the style mask makes it give up its
             // first-responder status.
             if ([_window respondsToSelector:@selector(setStyleMask:)]) {
-              [_window setStyleMask:NSBorderlessWindowMask];
+              [_window setStyleMask:([_window styleMask] & NSFullScreenWindowMask)];
             }
             [_window makeFirstResponder:_view];
             [_window setLevel:CGShieldingWindowLevel()];
@@ -963,13 +963,12 @@ set_properties_now(WindowProperties &properties) {
       // here.
       if (!properties.has_undecorated() && !_properties.get_undecorated() &&
           [_window respondsToSelector:@selector(setStyleMask:)]) {
-        if (properties.get_fixed_size()) {
-          [_window setStyleMask:NSTitledWindowMask | NSClosableWindowMask |
-                                NSMiniaturizableWindowMask ];
-        } else {
-          [_window setStyleMask:NSTitledWindowMask | NSClosableWindowMask |
-                                NSMiniaturizableWindowMask | NSResizableWindowMask ];
+        NSUInteger style = ([_window styleMask] & NSFullScreenWindowMask);
+        style |= NSTitledWindowMask | NSClosableWindowMask | NSMiniaturizableWindowMask;
+        if (!properties.get_fixed_size()) {
+          style |= NSResizableWindowMask;
         }
+        [_window setStyleMask:style];
         [_window makeFirstResponder:_view];
       }
     }
@@ -981,16 +980,14 @@ set_properties_now(WindowProperties &properties) {
     _properties.set_undecorated(properties.get_undecorated());
 
     if (!_properties.get_fullscreen()) {
-      if (properties.get_undecorated()) {
-        [_window setStyleMask: NSBorderlessWindowMask];
-      } else if (_properties.get_fixed_size()) {
-        // Fixed size windows should not show the resize button.
-        [_window setStyleMask: NSTitledWindowMask | NSClosableWindowMask |
-                               NSMiniaturizableWindowMask ];
-      } else {
-        [_window setStyleMask: NSTitledWindowMask | NSClosableWindowMask |
-                               NSMiniaturizableWindowMask | NSResizableWindowMask ];
+      NSUInteger style = ([_window styleMask] & NSFullScreenWindowMask);
+      if (!properties.get_undecorated()) {
+        style |= NSTitledWindowMask | NSClosableWindowMask | NSMiniaturizableWindowMask;
+        if (!properties.get_fixed_size()) {
+          style |= NSResizableWindowMask;
+        }
       }
+      [_window setStyleMask:style];
       [_window makeFirstResponder:_view];
     }