Skip to content

Commit d36cb75

Browse files
Remove "Window Persistence" feature flag (#12499)
Removes the `Feature_PersistedWindowLayout` feature flag so that it's always enabled. Closes #12422
1 parent 3b46794 commit d36cb75

File tree

6 files changed

+2
-23
lines changed

6 files changed

+2
-23
lines changed

src/cascadia/TerminalApp/TerminalPage.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -297,8 +297,7 @@ namespace winrt::TerminalApp::implementation
297297
// - true if the ApplicationState should be used.
298298
bool TerminalPage::ShouldUsePersistedLayout(CascadiaSettings& settings) const
299299
{
300-
return Feature_PersistedWindowLayout::IsEnabled() &&
301-
settings.GlobalSettings().FirstWindowPreference() == FirstWindowPreference::PersistedWindowLayout;
300+
return settings.GlobalSettings().FirstWindowPreference() == FirstWindowPreference::PersistedWindowLayout;
302301
}
303302

304303
// Method Description:

src/cascadia/TerminalSettingsEditor/Launch.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,4 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
7373

7474
return winrt::single_threaded_observable_vector(std::move(profiles));
7575
}
76-
77-
bool Launch::ShowFirstWindowPreference() const noexcept
78-
{
79-
return Feature_PersistedWindowLayout::IsEnabled();
80-
}
8176
}

src/cascadia/TerminalSettingsEditor/Launch.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
2929
void CurrentDefaultProfile(const IInspectable& value);
3030
winrt::Windows::Foundation::Collections::IObservableVector<IInspectable> DefaultProfiles() const;
3131

32-
bool ShowFirstWindowPreference() const noexcept;
33-
3432
WINRT_PROPERTY(Editor::LaunchPageNavigationState, State, nullptr);
3533

3634
GETSET_BINDABLE_ENUM_SETTING(FirstWindowPreference, Model::FirstWindowPreference, State().Settings().GlobalSettings().FirstWindowPreference);

src/cascadia/TerminalSettingsEditor/Launch.idl

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@ namespace Microsoft.Terminal.Settings.Editor
2020
// https://github.com/microsoft/microsoft-ui-xaml/issues/5395
2121
IObservableVector<IInspectable> DefaultProfiles { get; };
2222

23-
24-
Boolean ShowFirstWindowPreference { get; };
25-
2623
IInspectable CurrentFirstWindowPreference;
2724
IObservableVector<Microsoft.Terminal.Settings.Editor.EnumEntry> FirstWindowPreferenceList { get; };
2825

src/cascadia/TerminalSettingsEditor/Launch.xaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,7 @@
138138

139139
<!-- First Window Behavior -->
140140
<local:SettingContainer x:Uid="Globals_FirstWindowPreference"
141-
Style="{StaticResource ExpanderSettingContainerStyle}"
142-
Visibility="{x:Bind ShowFirstWindowPreference}">
141+
Style="{StaticResource ExpanderSettingContainerStyle}">
143142
<muxc:RadioButtons AutomationProperties.AccessibilityView="Content"
144143
ItemTemplate="{StaticResource EnumRadioButtonTemplate}"
145144
ItemsSource="{x:Bind FirstWindowPreferenceList}"

src/features.xml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -57,15 +57,6 @@
5757
</alwaysEnabledBrandingTokens>
5858
</feature>
5959

60-
<feature>
61-
<name>Feature_PersistedWindowLayout</name>
62-
<description>Whether to allow the user to enable persisted window layout saving and loading</description>
63-
<id>766</id>
64-
<stage>AlwaysEnabled</stage>
65-
<!-- This feature will not ship to Stable until it is complete. -->
66-
<alwaysDisabledReleaseTokens />
67-
</feature>
68-
6960
<feature>
7061
<name>Feature_AtlasEngine</name>
7162
<description>If enabled, AtlasEngine and the experimental.useAtlasEngine setting are compiled into the project</description>

0 commit comments

Comments
 (0)