From 9471e5e93c8fbc7232b86f575bfebbf0674ff3ff Mon Sep 17 00:00:00 2001
From: Jumar Macato <16554748+jmacato@users.noreply.github.com>
Date: Wed, 30 Aug 2023 16:50:52 +0000
Subject: [PATCH] Merge pull request #12725 from Actipro/fix-popup-offset

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 e9156e553d9..0a75732182f 100644
--- a/src/Windows/Avalonia.Win32/WindowImpl.cs
+++ b/src/Windows/Avalonia.Win32/WindowImpl.cs
@@ -552,7 +552,7 @@ private PixelSize HiddenBorderSize
             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;
                 }