From 15c26b9dd55ac83590b79ae61e73db937f580161 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Tue, 28 Jun 2022 12:06:21 +0200
Subject: [PATCH] Use frame size for CenterOwner startup location.

---
 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 92f74530e2..2dd391945b 100644
--- a/src/Avalonia.Controls/Window.cs
+++ b/src/Avalonia.Controls/Window.cs
@@ -901,10 +901,10 @@ namespace Avalonia.Controls
             {
                 if (owner != null)
                 {
-                    // TODO: We really need non-client size here.
+                    var ownerSize = owner.FrameSize ?? owner.ClientSize;
                     var ownerRect = new PixelRect(
                         owner.Position,
-                        PixelSize.FromSize(owner.ClientSize, scaling));
+                        PixelSize.FromSize(ownerSize, scaling));
                     Position = ownerRect.CenterRect(rect).Position;
                 }
             }