From 7ed3bfbfc2e760edd16b2a6aad34ec2c32e4501f Mon Sep 17 00:00:00 2001 From: Ashish Kumar Singh Date: Mon, 7 Feb 2022 09:04:41 +0530 Subject: [PATCH] Fix erge errors for #5931 and #5932 --- .../System/Windows/Controls/PopupControlService.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/PopupControlService.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/PopupControlService.cs index 1151233aab4..c60b7d19fcf 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/PopupControlService.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/PopupControlService.cs @@ -90,7 +90,7 @@ private void OnPostProcessInput(object sender, ProcessInputEventArgs e) if (directlyOver != null) { // Process the mouse move - OnMouseMove(directlyOver, mouseReport); + OnMouseMove(directlyOver); } } } @@ -139,9 +139,9 @@ private void OnPostProcessInput(object sender, ProcessInputEventArgs e) } } - private void OnMouseMove(IInputElement directlyOver, RawMouseInputReport mouseReport) + private void OnMouseMove(IInputElement directlyOver) { - if (MouseHasLeftSafeArea(mouseReport)) + if (MouseHasLeftSafeArea()) { DismissCurrentToolTip(); } @@ -883,7 +883,7 @@ private void SetSafeArea(ToolTip tooltip) } } - private bool MouseHasLeftSafeArea(RawMouseInputReport mouseReport) + private bool MouseHasLeftSafeArea() { // if there is no SafeArea, the mouse didn't leave it if (SafeArea == null) @@ -897,7 +897,7 @@ private bool MouseHasLeftSafeArea(RawMouseInputReport mouseReport) return true; // if the safe area is valid, see if it still contains the mouse point - return !SafeArea.ContainsPoint(mouseReport.InputSource, mouseReport.X, mouseReport.Y); + return !(SafeArea?.ContainsMousePoint() ?? true); } private ConvexHull SafeArea { get; set; }