Fix merge errors for #5931 and #5932#6078
Merged
singhashish-wpf merged 1 commit intodotnet:mainfrom Feb 7, 2022
singhashish-wpf:fixmergeconflict
Merged
Fix merge errors for #5931 and #5932#6078singhashish-wpf merged 1 commit intodotnet:mainfrom singhashish-wpf:fixmergeconflict
singhashish-wpf merged 1 commit intodotnet:mainfrom
singhashish-wpf:fixmergeconflict
Conversation
dipeshmsft
approved these changes
Feb 7, 2022
vishalmsft
approved these changes
Feb 7, 2022
dipeshmsft
pushed a commit
that referenced
this pull request
Feb 7, 2022
…6063) * ToolTips in popups (or any context where capture is active) (#5931) * make SafeArea check work when capture is active * Update and sync changes with main and #5932 Co-authored-by: Ashish Kumar Singh <SINGHASHISH@MICROSOFT.COM> * Fix merge errors for #5931 and #5932 (#6078) * update to make same changes as 5931 Co-authored-by: Sam Bent <sambent@microsoft.com>
SamBent
reviewed
Feb 7, 2022
|
|
||
| // 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); |
Contributor
There was a problem hiding this comment.
In light of the null check at 889, you can simplify this to
return !SafeArea.ContainsMousePoint();
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #6063 (comment)
Main PR
#5931 #5932
Description
Merge conflict in PopupControlService resulted in bad merge due to changes in same files being pushed one before another.
This additive PR fixes the bad merge problem by including both the resultant eventual changes.
Customer Impact
Regression
No
Testing
Build and code verification
Risk
Low