Fix Rename adornment positioning after scrolling#79284
Merged
jasonmalinowski merged 1 commit intodotnet:mainfrom Jul 8, 2025
Merged
Fix Rename adornment positioning after scrolling#79284jasonmalinowski merged 1 commit intodotnet:mainfrom
jasonmalinowski merged 1 commit intodotnet:mainfrom
Conversation
CyrusNajmabadi
approved these changes
Jul 8, 2025
JoeRobich
approved these changes
Jul 8, 2025
sandyarmstrong
approved these changes
Jul 8, 2025
jasonmalinowski
approved these changes
Jul 8, 2025
akhera99
approved these changes
Jul 8, 2025
Member
|
/backport to release/dev17.14 |
Contributor
|
Started backporting to release/dev17.14: https://github.com/dotnet/roslyn/actions/runs/16156492574 |
Contributor
|
@dibarbet backporting to "release/dev17.14" failed, the patch most likely resulted in conflicts: $ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Fix Rename adornment positioning after scrolling
Using index info to reconstruct a base tree...
A src/EditorFeatures/Core/InlineRename/UI/Adornment/RenameFlyout.xaml.cs
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): src/EditorFeatures/Core/InlineRename/UI/Adornment/RenameFlyout.xaml.cs deleted in HEAD and modified in Fix Rename adornment positioning after scrolling. Version Fix Rename adornment positioning after scrolling of src/EditorFeatures/Core/InlineRename/UI/Adornment/RenameFlyout.xaml.cs left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 Fix Rename adornment positioning after scrolling
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
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 join this conversation on GitHub.
Already have an account?
Sign in to comment
8 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.
When Rename is invoked after scrolling up, the adornment is occasionally displayed misplaced out of viewport. See https://developercommunity.visualstudio.com/t/Rename-dialog-opens-up-outside-of-editor/10919621.
.
This is a regression from #77466, which was a fix for horizontal clipping but also changed vertical positioning to never be negative. Unfortunately, when scrolling up, text view's viewport top and bottom can be negative.
The fix is to remove unnecessary Math.Max on top position value.