Browse Source

enable nullable on new files.

pull/3967/head
Dan Walmsley 6 years ago
parent
commit
38999e6b1a
  1. 4
      src/Avalonia.Controls/Primitives/ChromeOverlayLayer.cs
  2. 27
      src/Windows/Avalonia.Win32/WindowImpl.CustomCaptionProc.cs

4
src/Avalonia.Controls/Primitives/ChromeOverlayLayer.cs

@ -2,11 +2,13 @@
using Avalonia.Rendering; using Avalonia.Rendering;
using Avalonia.VisualTree; using Avalonia.VisualTree;
#nullable enable
namespace Avalonia.Controls.Primitives namespace Avalonia.Controls.Primitives
{ {
public class ChromeOverlayLayer : Panel, ICustomSimpleHitTest public class ChromeOverlayLayer : Panel, ICustomSimpleHitTest
{ {
public static ChromeOverlayLayer GetOverlayLayer(IVisual visual) public static ChromeOverlayLayer? GetOverlayLayer(IVisual visual)
{ {
foreach (var v in visual.GetVisualAncestors()) foreach (var v in visual.GetVisualAncestors())
if (v is VisualLayerManager vlm) if (v is VisualLayerManager vlm)

27
src/Windows/Avalonia.Win32/WindowImpl.CustomCaptionProc.cs

@ -4,6 +4,8 @@ using Avalonia.Controls;
using Avalonia.Input; using Avalonia.Input;
using static Avalonia.Win32.Interop.UnmanagedMethods; using static Avalonia.Win32.Interop.UnmanagedMethods;
#nullable enable
namespace Avalonia.Win32 namespace Avalonia.Win32
{ {
public partial class WindowImpl public partial class WindowImpl
@ -100,24 +102,29 @@ namespace Avalonia.Win32
uint timestamp = unchecked((uint)GetMessageTime()); uint timestamp = unchecked((uint)GetMessageTime());
Debug.WriteLine(hittestResult);
if (hittestResult == HitTestValues.HTCAPTION) if (hittestResult == HitTestValues.HTCAPTION)
{ {
var position = PointToClient(PointFromLParam(lParam)); 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) if (visual != null)
{ {
hittestResult = HitTestValues.HTCLIENT; hittestResult = HitTestValues.HTCLIENT;
lRet = (IntPtr)hittestResult; lRet = (IntPtr)hittestResult;
}
} }
} }

Loading…
Cancel
Save