Fix issue #3366: Preserve tree expansion and UI state after refresh#3369
Merged
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
This PR addresses WinMerge issue #3366 by preserving folder-compare view state across refresh/rescan operations (F5 / Ctrl+F5), so previously collapsed/expanded nodes aren’t unexpectedly expanded and the user’s position in the list is maintained.
Changes:
- Add saving/restoring of DirView focus + scroll position across rescans.
- Avoid applying “Expand different/identical subfolders” auto-expansion when a saved tree state is being restored.
- Save UI/tree state before additional rescan triggers (e.g., marked rescan, status-bar compare method change).
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
Src/DirView.h |
Adds APIs and member storage for persisting/restoring UI state across rescans. |
Src/DirView.cpp |
Implements UI state save/restore and integrates it into refresh/rescan/update flow. |
Src/DirActions.h |
Introduces DirViewUIState struct to hold focus/scroll restoration data. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
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.
This fixes #3366.
When “Expand different subfolders” or “Expand identical subfolders” was selected in the Options dialog under Compare/Folder, the tree state was not restored correctly after rescanning with F5 or Ctrl+F5.
This change also restores the scroll position and focused item after rescanning.