From ba2f00d60a7ec58f1d4f0f31db52ce6c60f3002a Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Wed, 20 May 2020 15:13:13 -0300
Subject: [PATCH] render hit test non-client area.

---
 .../Avalonia.Win32/WindowImpl.WndProc.cs       | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/Windows/Avalonia.Win32/WindowImpl.WndProc.cs b/src/Windows/Avalonia.Win32/WindowImpl.WndProc.cs
index 82374893f1..001fa042c3 100644
--- a/src/Windows/Avalonia.Win32/WindowImpl.WndProc.cs
+++ b/src/Windows/Avalonia.Win32/WindowImpl.WndProc.cs
@@ -98,13 +98,14 @@ namespace Avalonia.Win32
                         LEFTEXTENDWIDTH = border_thickness.left;
                         RIGHTEXTENDWIDTH = border_thickness.right;
                         BOTTOMEXTENDWIDTH = border_thickness.bottom;
+                        TOPEXTENDWIDTH = border_thickness.top;
 
                         // Extend the frame into the client area.                        
                         margins.cxLeftWidth = border_thickness.left;
                         margins.cxRightWidth = border_thickness.right;
                         margins.cyBottomHeight = border_thickness.bottom;
                         margins.cyTopHeight = border_thickness.top;
-                         
+
                         var hr = DwmExtendFrameIntoClientArea(hWnd, ref margins);
 
                         //if (hr < 0)
@@ -132,6 +133,21 @@ namespace Avalonia.Win32
                     {
                         lRet = (IntPtr)HitTestNCA(hWnd, wParam, lParam);
 
+                        uint timestamp = unchecked((uint)GetMessageTime());
+
+                        if (((HitTestValues)lRet) == HitTestValues.HTCAPTION)
+                        {
+                            var position = PointToClient(PointFromLParam(lParam));
+
+                            var visual = (_owner as Window).Renderer.HitTestFirst(position, _owner as Window, null);
+
+                            if(visual != null)
+                            {                                
+                                lRet = (IntPtr)HitTestValues.HTCLIENT;
+                            }
+                                                       
+                        }
+
                         if (((HitTestValues)lRet) != HitTestValues.HTNOWHERE)
                         {
                             callDwp = false;