From dfa0c44269a05206bcbb288ea575ad4bc44c3ffa Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Mon, 27 Jun 2022 10:16:37 +0200
Subject: [PATCH] Set actualWindowState earlier.

Previously, `_actualWindowState` was being set after the window state had finished changing, but `ExitFullScreenMode` calls `UpdateStyle` which expects `_actualWindowState` to be up-to-date, meaning that previously we ended up with an invalid size when exiting full screen mode programatically.
---
 native/Avalonia.Native/src/OSX/WindowImpl.mm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/native/Avalonia.Native/src/OSX/WindowImpl.mm b/native/Avalonia.Native/src/OSX/WindowImpl.mm
index 6db586f3ca..5b0c7813f7 100644
--- a/native/Avalonia.Native/src/OSX/WindowImpl.mm
+++ b/native/Avalonia.Native/src/OSX/WindowImpl.mm
@@ -488,6 +488,8 @@ HRESULT WindowImpl::SetWindowState(AvnWindowState state) {
         }
 
         if (_shown) {
+            _actualWindowState = _lastWindowState;
+
             switch (state) {
                 case Maximized:
                     if (currentState == FullScreen) {
@@ -545,7 +547,6 @@ HRESULT WindowImpl::SetWindowState(AvnWindowState state) {
                     break;
             }
 
-            _actualWindowState = _lastWindowState;
             WindowEvents->WindowStateChanged(_actualWindowState);
         }