Fix dock icons disappearing on discard after size change (#47253)#48139
Draft
michaeljolley wants to merge 1 commit into
Draft
Fix dock icons disappearing on discard after size change (#47253)#48139michaeljolley wants to merge 1 commit into
michaeljolley wants to merge 1 commit into
Conversation
When dock size is changed in settings while in edit mode and then discarded, the DockControl.DockSize DP was never restored to the pre-edit value. This caused a state mismatch where the view rendered at the wrong size while the ViewModel held the original settings. Fix: RestoreBandOrder() now persists the snapshot settings back to the service (while _isEditing is still true to prevent redundant rebuilds) and returns the restored DockSettings. DiscardEditMode() uses those settings to immediately sync the DockControl's DockSize and related properties. Co-authored-by: Copilot <223556219+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.
Summary
Fixes #47253
Root Cause
When dock size is changed in CmdPal settings while the dock is in edit mode, DockControl.DockSize DP is updated but ViewModel.UpdateSettings() is blocked by _isEditing. On discard, RestoreBandOrder() restored the ViewModel settings but never synced DockControl.DockSize back, leaving the view in an inconsistent state.
Fix