From 5f9c8525f0c963deae389d11e9749dcef665d883 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Tue, 9 Aug 2022 18:38:40 +0100
Subject: [PATCH] Merge pull request #8574 from
 AvaloniaUI/fixes/win32-consistent-minimize-restore-window-size

Win32: Retain window position and size when docked and then minimized and restored.
# Conflicts:
#	tests/Avalonia.IntegrationTests.Appium/WindowTests.cs
---
 src/Windows/Avalonia.Win32/WindowImpl.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Windows/Avalonia.Win32/WindowImpl.cs b/src/Windows/Avalonia.Win32/WindowImpl.cs
index a72d85b3645..a71f625ef26 100644
--- a/src/Windows/Avalonia.Win32/WindowImpl.cs
+++ b/src/Windows/Avalonia.Win32/WindowImpl.cs
@@ -263,11 +263,12 @@ public WindowState WindowState
 
             set
             {
-                if (IsWindowVisible(_hwnd))
+                if (IsWindowVisible(_hwnd) && _lastWindowState != value)
                 {
                     ShowWindow(value, value != WindowState.Minimized); // If the window is minimized, it shouldn't be activated
                 }
 
+                _lastWindowState = value;
                 _showWindowState = value;
             }
         }