Skip to content

Fix merge errors for #5931 and #5932 #6078

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 7, 2022
Merged

Fix merge errors for #5931 and #5932 #6078

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions ...osoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Controls/PopupControlService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ private void OnPostProcessInput(object sender, ProcessInputEventArgs e)
if (directlyOver != null)
{
// Process the mouse move
OnMouseMove(directlyOver, mouseReport);
OnMouseMove(directlyOver);
}
}
}
Expand Down Expand Up @@ -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();
}
Expand Down Expand Up @@ -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)
Expand All @@ -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);
Copy link
Contributor

@SamBent SamBent Feb 7, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In light of the null check at 889, you can simplify this to

    return !SafeArea.ContainsMousePoint();

}

private ConvexHull SafeArea { get; set; }
Expand Down