Merge pull request #12725 from Actipro/fix-popup-offset

jmacato · web-flow · commit 0f93224d9cd5 · 2023-08-30T16:50:52.000Z
Fix popups in Windows being offset incorrectly by a workaround for another issue
diff --git 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;
                 }

Original file line number	Diff line number	Diff line change
`@@ -552,7 +552,7 @@ private PixelSize HiddenBorderSize`
`552`	`552`	`get`
`553`	`553`	`{`
`554`	`554`	`// Windows 10 and 11 add a 7 pixel invisible border on the left/right/bottom of windows for resizing`
`555`		`- if (Win32Platform.WindowsVersion.Major < 10 \|\| !HasFullDecorations)`
	`555`	`+ if (Win32Platform.WindowsVersion.Major < 10 \|\| !HasFullDecorations \|\| GetStyle().HasFlag(WindowStyles.WS_POPUP))`
`556`	`556`	`{`
`557`	`557`	`return PixelSize.Empty;`
`558`	`558`	`}`