From b6e3cc095b11a43b68fa2d91a2fe4a554c523554 Mon Sep 17 00:00:00 2001
From: Bill Henning <bill.henning@actiprosoftware.com>
Date: Wed, 30 Aug 2023 10:46:24 -0400
Subject: [PATCH] Fix popups in Windows being offset incorrectly by a
 workaround for another issue.

---
 src/Windows/Avalonia.Win32/WindowImpl.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Windows/Avalonia.Win32/WindowImpl.cs b/src/Windows/Avalonia.Win32/WindowImpl.cs
index e9156e553d..0a75732182 100644
--- a/src/Windows/Avalonia.Win32/WindowImpl.cs
+++ b/src/Windows/Avalonia.Win32/WindowImpl.cs
@@ -552,7 +552,7 @@ namespace Avalonia.Win32
             get
             {
                 // Windows 10 and 11 add a 7 pixel invisible border on the left/right/bottom of windows for resizing
-                if (Win32Platform.WindowsVersion.Major < 10 || !HasFullDecorations)
+                if (Win32Platform.WindowsVersion.Major < 10 || !HasFullDecorations || GetStyle().HasFlag(WindowStyles.WS_POPUP))
                 {
                     return PixelSize.Empty;
                 }