fix: side-by-side diff scroll desync on hidden-tab rebuild and tab switch - #2611
Merged
love-linger merged 1 commit intoAug 7, 2026
Conversation
Collaborator
|
It's not necessary add move code to All we need is adding a single line |
JC-Chung
force-pushed
the
fix/side-by-side-scroll-sync-hidden-tab
branch
from
August 7, 2026 02:25
1fe9919 to
91bd4cb
Compare
Collaborator
|
Tested it manually. Looks good to me. |
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
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.
Why
OnLoaded+FindDescendantOfType<ScrollViewer>()assumed the controltemplate was already applied, which broke in two cases:
IsVisible=false),e.g. toggling the shared
Preferences.UseSideBySideDifffrom theother LOCAL/HISTORY tab —
Loadedfires but template application(tied to layout) is skipped for hidden subtrees.
instance across tab switches — clearing
_scrollViewerto null inOnUnloadedpermanently lost the binding sinceOnApplyTemplateonly runs once per instance.
Fix
Move
ScrollViewerlookup + offset binding intoOnApplyTemplate(matching
MergeConflictTextPresenter), forceApplyTemplate()inOnLoaded, and stop resetting_scrollViewerinOnUnloaded.Test