From 4f3a010d0b8394eec88eb055cc131983c356ad16 Mon Sep 17 00:00:00 2001
From: Tim Miller <drasticactions@users.noreply.github.com>
Date: Wed, 29 Oct 2025 15:58:36 +0900
Subject: [PATCH] [Avalonia.Native] Fix fullscreen transitions with
 ExtendClientAreaToDecorationsHint windows (#19939)

---
 native/Avalonia.Native/src/OSX/AvnWindow.mm | 37 ++++++++++++---------
 native/Avalonia.Native/src/OSX/WindowImpl.h |  4 ++-
 2 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/native/Avalonia.Native/src/OSX/AvnWindow.mm b/native/Avalonia.Native/src/OSX/AvnWindow.mm
index ea15c792a7..6d49fc85e0 100644
--- a/native/Avalonia.Native/src/OSX/AvnWindow.mm
+++ b/native/Avalonia.Native/src/OSX/AvnWindow.mm
@@ -436,23 +436,28 @@
                 return;
             }
 
-            // If the window has been moved into a position where it's "zoomed"
-            // Then it should be set as Maximized.
-            if (window->WindowState() != Maximized && window->IsZoomed())
+            // Don't adjust window state during fullscreen transitions
+            // as this can interfere with proper decoration restoration
+            if(!window->IsTransitioningWindowState())
             {
-                window->SetWindowState(Maximized, false);
-            }
-            // We should only return the window state to normal if
-            // the internal window state is maximized, and macOS says
-            // the window is no longer zoomed (I.E, the user has moved it)
-            // Stage Manager will "move" the window when repositioning it
-            // So if the window was "maximized" before, it should stay maximized
-            else if(window->WindowState() == Maximized && !window->IsZoomed())
-            {
-                // If we're moving the window while maximized,
-                // we need to let macOS handle if it should be resized
-                // And not handle it ourselves.
-                window->SetWindowState(Normal, false);
+                // If the window has been moved into a position where it's "zoomed"
+                // Then it should be set as Maximized.
+                if (window->WindowState() != Maximized && window->IsZoomed())
+                {
+                    window->SetWindowState(Maximized, false);
+                }
+                // We should only return the window state to normal if
+                // the internal window state is maximized, and macOS says
+                // the window is no longer zoomed (I.E, the user has moved it)
+                // Stage Manager will "move" the window when repositioning it
+                // So if the window was "maximized" before, it should stay maximized
+                else if(window->WindowState() == Maximized && !window->IsZoomed())
+                {
+                    // If we're moving the window while maximized,
+                    // we need to let macOS handle if it should be resized
+                    // And not handle it ourselves.
+                    window->SetWindowState(Normal, false);
+                }
             }
         }
 
diff --git a/native/Avalonia.Native/src/OSX/WindowImpl.h b/native/Avalonia.Native/src/OSX/WindowImpl.h
index 7b911ef945..940699f09d 100644
--- a/native/Avalonia.Native/src/OSX/WindowImpl.h
+++ b/native/Avalonia.Native/src/OSX/WindowImpl.h
@@ -87,7 +87,9 @@ BEGIN_INTERFACE_MAP()
     bool CanBecomeKeyWindow ();
 
     bool CanZoom() override { return _isEnabled && _canMaximize; }
-    
+
+    bool IsTransitioningWindowState() { return _transitioningWindowState; }
+
 protected:
     virtual NSWindowStyleMask CalculateStyleMask() override;
     virtual void UpdateAppearance() override;