From d4ec5474d34c5f8e1fa153d25c9ced04719bdaa6 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Mon, 11 Jul 2022 12:45:57 +0100
Subject: [PATCH] Ensure Window MinHeight/Width is obeyed.

---
 src/Avalonia.Controls/Window.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Avalonia.Controls/Window.cs b/src/Avalonia.Controls/Window.cs
index 2dd391945b..9b4bb51aca 100644
--- a/src/Avalonia.Controls/Window.cs
+++ b/src/Avalonia.Controls/Window.cs
@@ -681,8 +681,8 @@ namespace Avalonia.Controls
             IsVisible = true;
 
             var initialSize = new Size(
-                double.IsNaN(Width) ? ClientSize.Width : Width,
-                double.IsNaN(Height) ? ClientSize.Height : Height);
+                double.IsNaN(Width) ? Math.Max(MinWidth, ClientSize.Width) : Width,
+                double.IsNaN(Height) ? Math.Max(MinHeight, ClientSize.Height) : Height);
 
             if (initialSize != ClientSize)
             {