Use ShowWindowCommand.Hide when positioning a win32 window that has n…

…ot yet been shown
AvaloniaUI · Mar 19, 2024 · 6c6d1b2 · 6c6d1b2
1 parent 84b06b2
commit 6c6d1b2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/Windows/Avalonia.Win32/WindowImpl.AppWndProc.cs b/src/Windows/Avalonia.Win32/WindowImpl.AppWndProc.cs
@@ -618,6 +618,9 @@ protected virtual unsafe IntPtr AppWndProc(IntPtr hWnd, uint msg, IntPtr wParam,
                             SizeCommand.Maximized => WindowState.Maximized,
                             SizeCommand.Minimized => WindowState.Minimized,
                             _ when _isFullScreenActive => WindowState.FullScreen,
+                            // Ignore state changes for unshown windows. We always tell Windows that we are hidden
+                            // until shown, so the OS value should be ignored while we are in the unshown state.
+                            _ when !_shown => _lastWindowState,
                             _ => WindowState.Normal,
                         };
 

diff --git a/src/Windows/Avalonia.Win32/WindowImpl.cs b/src/Windows/Avalonia.Win32/WindowImpl.cs
@@ -607,7 +607,7 @@ public void Resize(Size value, WindowResizeReason reason)
 
             windowPlacement.NormalPosition = requestedWindowRect;
 
-            windowPlacement.ShowCmd = _lastWindowState switch
+            windowPlacement.ShowCmd = !_shown ? ShowWindowCommand.Hide : _lastWindowState switch
             {
                 WindowState.Minimized => ShowWindowCommand.ShowMinNoActive,
                 WindowState.Maximized => ShowWindowCommand.ShowMaximized,