From 47a328ab878aa61e09c588310c42b4d8fc23f97d Mon Sep 17 00:00:00 2001
From: Nathan Garside <code@nathangarside.com>
Date: Thu, 27 Jan 2022 15:04:44 +0000
Subject: [PATCH] Add window position offset

---
 src/Windows/Avalonia.Win32/WindowImpl.cs | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/Windows/Avalonia.Win32/WindowImpl.cs b/src/Windows/Avalonia.Win32/WindowImpl.cs
index e4f5268285..9c4037be92 100644
--- a/src/Windows/Avalonia.Win32/WindowImpl.cs
+++ b/src/Windows/Avalonia.Win32/WindowImpl.cs
@@ -448,10 +448,20 @@ namespace Avalonia.Win32
             {
                 GetWindowRect(_hwnd, out var rc);
 
+                // 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)
+                {
+                    return new PixelPoint(rc.left + (int)(7 * _scaling), rc.top);
+                }
+
                 return new PixelPoint(rc.left, rc.top);
             }
             set
             {
+                if (Win32Platform.WindowsVersion.Major >= 10 && HasFullDecorations)
+                {
+                    value = new PixelPoint(value.X - (int)(7 * _scaling), value.Y);
+                }
                 SetWindowPos(
                     Handle.Handle,
                     IntPtr.Zero,