Add firstWindowPreference value for layout only#19341
Merged
carlos-zamora merged 3 commits intomainfrom Oct 27, 2025
Merged
Conversation
| _logSettingSet(LegacyForceVTInputKey); | ||
| } | ||
|
|
||
| // GLOBAL_SETTINGS_LAYER_JSON above should've already loaded this value properly. |
Check failure
Code scanning / check-spelling
Unrecognized Spelling
lhecker
approved these changes
Oct 23, 2025
lhecker
approved these changes
Oct 27, 2025
DHowett
reviewed
Oct 27, 2025
Comment on lines
+456
to
+460
| <value>Open windows from a previous session (layout and content)</value> | ||
| <comment>An option to choose from for the "First window preference" setting. Reopen the layouts from the last session and preserve the content.</comment> | ||
| </data> | ||
| <data name="Globals_FirstWindowPreferencePersistedLayout.Content" xml:space="preserve"> | ||
| <value>Open windows from a previous session (layout only)</value> |
Member
There was a problem hiding this comment.
let's workshop these names before we send them off to the loc team ;P
DHowett
reviewed
Oct 27, 2025
| // We just need to detect if the legacy value was used and mark it for fixup, if so. | ||
| if (const auto firstWindowPreferenceValue = json[FirstWindowPreferenceKey.data()]) | ||
| { | ||
| _fixupsAppliedDuringLoad |= firstWindowPreferenceValue == LegacyPersistedWindowLayout.data(); |
Member
There was a problem hiding this comment.
oh wow - we've never done a fixup for a legacy key like this!
DHowett
reviewed
Oct 27, 2025
| <comment>An option to choose from for the "First window preference" setting. Reopen the layouts from the last session.</comment> | ||
| </data> | ||
| <data name="Globals_FirstWindowPreferencePersistedLayoutAndContent.Content" xml:space="preserve"> | ||
| <value>Open windows from a previous session (layout and content)</value> |
Member
There was a problem hiding this comment.
maybe "Restore window layout" and "Restore window layout and content"
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
3 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.
Summary of the Pull Request
Updates the "firstWindowPreference" global setting to take 3 values: "defaultProfile", "persistedLayout", and "persistedLayoutAndContent".
The legacy "persistedWindowLayout" is being interpreted as "persistedLayoutAndContent".
The tricky part here is that we need to maintain support for the legacy value as persisting the layout and content, even though the value's name suggests that it should just support the layout and no content. To get around this, I added "persistedLayout" and "persistedLayoutAndContent".
The enum map is manually constructed for
FirstWindowPreferenceto exclude the deprecated value. This prevents the legacy value from leaking into the settings UI.Functionally, the change to serialize the contents is simple.
WindowEmperor::_persistState()'s second parameter is used to serialize the buffer. Rather than having it set totrue, we set it toGlobalSettings().FirstWindowPreference() == FirstWindowPreference::PersistedLayoutAndContent.Validation Steps Performed
✅ "persistedWindowLayout" is changed to "persistedLayoutAndContent"
Closes #18757