Merge pull request #438 from bbuerger/master

NullCheck for DragPoint
Dirkster99 · Aug 16, 2023 · 2ce0033 · 2ce0033
2 parents 982004b + 31cf051
commit 2ce0033
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/source/Components/AvalonDock/Controls/LayoutAnchorableFloatingWindowControl.cs b/source/Components/AvalonDock/Controls/LayoutAnchorableFloatingWindowControl.cs
@@ -149,6 +149,8 @@ bool IOverlayWindowHost.HitTestScreen(Point dragPoint)
 
 		bool HitTest(Point dragPoint)
 		{
+			if (dragPoint == default(Point)) 
+				return false;
 			var detectionRect = new Rect(this.PointToScreenDPIWithoutFlowDirection(new Point()), this.TransformActualSizeToAncestor());
 			return detectionRect.Contains(dragPoint);
 		}

diff --git a/source/Components/AvalonDock/Controls/LayoutDocumentFloatingWindowControl.cs b/source/Components/AvalonDock/Controls/LayoutDocumentFloatingWindowControl.cs
@@ -224,6 +224,8 @@ bool IOverlayWindowHost.HitTestScreen(Point dragPoint)
 
 		bool HitTest(Point dragPoint)
 		{
+			if (dragPoint == default(Point)) 
+				return false;
 			var detectionRect = new Rect(this.PointToScreenDPIWithoutFlowDirection(new Point()), this.TransformActualSizeToAncestor());
 			return detectionRect.Contains(dragPoint);
 		}

diff --git a/source/Components/AvalonDock/Controls/TransformExtentions.cs b/source/Components/AvalonDock/Controls/TransformExtentions.cs
@@ -1,4 +1,4 @@
-/************************************************************************
+/************************************************************************
    AvalonDock
 
    Copyright (C) 2007-2013 Xceed Software Inc.
@@ -59,7 +59,10 @@ public static Rect GetScreenArea(this FrameworkElement element)
 
 		public static Point TransformToDeviceDPI(this Visual visual, Point pt)
 		{
-			Matrix m = PresentationSource.FromVisual(visual).CompositionTarget.TransformToDevice;
+			var compositionTarget = PresentationSource.FromVisual(visual).CompositionTarget;
+			if (compositionTarget == null)
+				return default;
+			Matrix m = compositionTarget.TransformToDevice;
 			return new Point(pt.X / m.M11, pt.Y / m.M22);
 		}