From 5b5c2e44c7691c3408fb9b68ec59f9816c48c56a Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Mon, 20 Apr 2020 16:19:37 +0200
Subject: [PATCH] Fix window sizing again.

We need to measure with the client size when `SizeToContent` is `Manual`.
---
 src/Avalonia.Controls/Window.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Controls/Window.cs b/src/Avalonia.Controls/Window.cs
index b21f18a59d..ee596432f7 100644
--- a/src/Avalonia.Controls/Window.cs
+++ b/src/Avalonia.Controls/Window.cs
@@ -570,8 +570,8 @@ namespace Avalonia.Controls
         protected override Size MeasureOverride(Size availableSize)
         {
             var sizeToContent = SizeToContent;
-            var constraint = availableSize;
             var clientSize = ClientSize;
+            var constraint = clientSize;
 
             if (sizeToContent.HasFlagCustom(SizeToContent.Width))
             {