From 0d109ea996fe482ae8403b90657bc3def8fbcb74 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sat, 18 Apr 2020 14:25:23 +0200
Subject: [PATCH] Apply all layout constraints in WindowBase.

---
 src/Avalonia.Controls/WindowBase.cs | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/src/Avalonia.Controls/WindowBase.cs b/src/Avalonia.Controls/WindowBase.cs
index ea722f2952..bb63d1b353 100644
--- a/src/Avalonia.Controls/WindowBase.cs
+++ b/src/Avalonia.Controls/WindowBase.cs
@@ -244,17 +244,7 @@ namespace Avalonia.Controls
             ApplyStyling();
             ApplyTemplate();
 
-            var constraint = availableSize;
-
-            if (!double.IsNaN(Width))
-            {
-                constraint = constraint.WithWidth(Width);
-            }
-
-            if (!double.IsNaN(Height))
-            {
-                constraint = constraint.WithHeight(Height);
-            }
+            var constraint = LayoutHelper.ApplyLayoutConstraints(this, availableSize);
 
             return MeasureOverride(constraint);
         }