From 38999e6b1aabb65533348e408624813df911fae8 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Thu, 2 Jul 2020 13:26:07 -0300
Subject: [PATCH] enable nullable on new files.

---
 .../Primitives/ChromeOverlayLayer.cs          |  4 ++-
 .../WindowImpl.CustomCaptionProc.cs           | 27 ++++++++++++-------
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/src/Avalonia.Controls/Primitives/ChromeOverlayLayer.cs b/src/Avalonia.Controls/Primitives/ChromeOverlayLayer.cs
index 772251f7ef..ba0fdfd535 100644
--- a/src/Avalonia.Controls/Primitives/ChromeOverlayLayer.cs
+++ b/src/Avalonia.Controls/Primitives/ChromeOverlayLayer.cs
@@ -2,11 +2,13 @@
 using Avalonia.Rendering;
 using Avalonia.VisualTree;
 
+#nullable enable
+
 namespace Avalonia.Controls.Primitives
 {
     public class ChromeOverlayLayer : Panel, ICustomSimpleHitTest
     {
-        public static ChromeOverlayLayer GetOverlayLayer(IVisual visual)
+        public static ChromeOverlayLayer? GetOverlayLayer(IVisual visual)
         {
             foreach (var v in visual.GetVisualAncestors())
                 if (v is VisualLayerManager vlm)
diff --git a/src/Windows/Avalonia.Win32/WindowImpl.CustomCaptionProc.cs b/src/Windows/Avalonia.Win32/WindowImpl.CustomCaptionProc.cs
index d4d7528ef4..08791882de 100644
--- a/src/Windows/Avalonia.Win32/WindowImpl.CustomCaptionProc.cs
+++ b/src/Windows/Avalonia.Win32/WindowImpl.CustomCaptionProc.cs
@@ -4,6 +4,8 @@ using Avalonia.Controls;
 using Avalonia.Input;
 using static Avalonia.Win32.Interop.UnmanagedMethods;
 
+#nullable enable
+
 namespace Avalonia.Win32
 {
     public partial class WindowImpl
@@ -100,24 +102,29 @@ namespace Avalonia.Win32
 
                         uint timestamp = unchecked((uint)GetMessageTime());
 
+                        Debug.WriteLine(hittestResult);
+
                         if (hittestResult == HitTestValues.HTCAPTION)
                         {
                             var position = PointToClient(PointFromLParam(lParam));
 
-                            var visual = (_owner as Window).Renderer.HitTestFirst(position, _owner as Window, x =>
+                            if (_owner is Window window)
                             {
-                                if (x is IInputElement ie && !ie.IsHitTestVisible)
+                                var visual = window.Renderer.HitTestFirst(position, _owner as Window, x =>
                                 {
-                                    return false;
-                                }
+                                    if (x is IInputElement ie && !ie.IsHitTestVisible)
+                                    {
+                                        return false;
+                                    }
 
-                                return true;
-                            });
+                                    return true;
+                                });
 
-                            if (visual != null)
-                            {
-                                hittestResult = HitTestValues.HTCLIENT;
-                                lRet = (IntPtr)hittestResult;
+                                if (visual != null)
+                                {
+                                    hittestResult = HitTestValues.HTCLIENT;
+                                    lRet = (IntPtr)hittestResult;
+                                }
                             }
                         }