From: Aaron Jensen <aaronjensen@gmail.com>
Date: Sun, 17 Nov 2024 04:54:59 +0000 (-0800)
Subject: Fix NS non-native fullscreen on initial frame load (bug#59790)
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d8f828cf06f459841387ea0f918e07178038cb82;p=emacs.git

Fix NS non-native fullscreen on initial frame load (bug#59790)

* src/nsterm.m ([EmacsView toggleFullScreen:]): Reset fs_is_native

(cherry picked from commit 03ae07291e85fd353595806c3ce1ad3315c47649)
---

diff --git a/src/nsterm.m b/src/nsterm.m
index 205b1621399..dceb3cebb4d 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -8524,6 +8524,11 @@ ns_in_echo_area (void)
 
   NSTRACE ("[EmacsView toggleFullScreen:]");
 
+  /* Reset fs_is_native to value of ns-use-native-full-screen if not
+     fullscreen already */
+  if (fs_state != FULLSCREEN_BOTH)
+    fs_is_native = ns_use_native_fullscreen;
+
   if (fs_is_native)
     {
 #if defined (NS_IMPL_COCOA) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1070