starred/terminal
1
0
Fork 0
mirror of https://github.com/microsoft/terminal.git synced 2026-05-21 06:18:34 +00:00
Code Issues 19.0k Packages Projects Releases 20 Wiki Activity

Add SectionExpanderStyle to deduplicate code

Browse Source
This commit is contained in:
Carlos Zamora
2026-05-12 14:15:33 -07:00
parent fa2d052ccd
commit fa0f2a7e16
12 changed files with 140 additions and 320 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/cascadia/TerminalSettingsEditor/Appearances.xaml
View File

@@ -69,18 +69,7 @@
<StackPanel>
<!-- Section: Typography settings -->
<muxc:Expander IsExpanded="True"
AutomationProperties.Name="{Binding Text, ElementName=Appearance_Section_Typography_Title_AccTitle}"
Style="{StaticResource SectionExpanderStyle}">
<muxc:Expander.Header>
<StackPanel Style="{StaticResource SectionExpanderHeaderStackStyle}">
<TextBlock x:Name="Appearance_Section_Typography_Title_AccTitle"
x:Uid="Appearance_Section_Typography_Title"
Style="{StaticResource SectionExpanderHeaderTextStyle}" />
<TextBlock x:Uid="Appearance_Section_Typography_Help"
Style="{StaticResource SectionExpanderHelpTextStyle}" />
</StackPanel>
</muxc:Expander.Header>
<local:SettingContainer x:Uid="Appearance_Section_Typography" StartExpanded="True" Style="{StaticResource SectionExpanderStyle}">
<StackPanel>
<!-- Color Scheme -->
<!-- This currently only display the Dark color scheme, even if the user has a pair of schemes set. -->
@@ -507,20 +496,10 @@
Style="{StaticResource ComboBoxSettingStyle}" />
</local:SettingContainer>
</StackPanel>
</muxc:Expander>
</local:SettingContainer>
<!-- Section: Cursor settings -->
<muxc:Expander AutomationProperties.Name="{Binding Text, ElementName=Appearance_Section_Cursor_Title_AccTitle}"
Style="{StaticResource SectionExpanderStyle}">
<muxc:Expander.Header>
<StackPanel Style="{StaticResource SectionExpanderHeaderStackStyle}">
<TextBlock x:Name="Appearance_Section_Cursor_Title_AccTitle"
x:Uid="Appearance_Section_Cursor_Title"
Style="{StaticResource SectionExpanderHeaderTextStyle}" />
<TextBlock x:Uid="Appearance_Section_Cursor_Help"
Style="{StaticResource SectionExpanderHelpTextStyle}" />
</StackPanel>
</muxc:Expander.Header>
<local:SettingContainer x:Uid="Appearance_Section_Cursor" Style="{StaticResource SectionExpanderStyle}">
<StackPanel>
<!-- Cursor Shape -->
@@ -575,20 +554,10 @@
NullColorPreview="{x:Bind Appearance.CurrentColorScheme.CursorColor.Color, Mode=OneWay}" />
</local:SettingContainer>
</StackPanel>
</muxc:Expander>
</local:SettingContainer>
<!-- Section: Background image -->
<muxc:Expander AutomationProperties.Name="{Binding Text, ElementName=Appearance_Section_BackgroundImage_Title_AccTitle}"
Style="{StaticResource SectionExpanderStyle}">
<muxc:Expander.Header>
<StackPanel Style="{StaticResource SectionExpanderHeaderStackStyle}">
<TextBlock x:Name="Appearance_Section_BackgroundImage_Title_AccTitle"
x:Uid="Appearance_Section_BackgroundImage_Title"
Style="{StaticResource SectionExpanderHeaderTextStyle}" />
<TextBlock x:Uid="Appearance_Section_BackgroundImage_Help"
Style="{StaticResource SectionExpanderHelpTextStyle}" />
</StackPanel>
</muxc:Expander.Header>
<local:SettingContainer x:Uid="Appearance_Section_BackgroundImage" Style="{StaticResource SectionExpanderStyle}">
<StackPanel>
<!-- Background Image -->
@@ -843,7 +812,7 @@
</Grid>
</local:SettingContainer>
</StackPanel>
</muxc:Expander>
</local:SettingContainer>
</StackPanel>
</UserControl>

29
src/cascadia/TerminalSettingsEditor/CommonResources.xaml
View File

@@ -168,35 +168,6 @@
<Setter Property="Margin" Value="0,32,0,4" />
</Style>
<Style x:Key="SectionExpanderStyle"
TargetType="muxc:Expander">
<Setter Property="MaxWidth" Value="{StaticResource StandardControlMaxWidth}" />
<Setter Property="Margin" Value="0,12,0,0" />
<Setter Property="HorizontalAlignment" Value="Stretch" />
<Setter Property="HorizontalContentAlignment" Value="Stretch" />
</Style>
<Style x:Key="SectionExpanderHeaderStackStyle"
TargetType="StackPanel">
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="Padding" Value="0,12,0,12" />
</Style>
<Style x:Key="SectionExpanderHeaderTextStyle"
BasedOn="{StaticResource BodyTextBlockStyle}"
TargetType="TextBlock">
<Setter Property="VerticalAlignment" Value="Center" />
</Style>
<Style x:Key="SectionExpanderHelpTextStyle"
BasedOn="{StaticResource CaptionTextBlockStyle}"
TargetType="TextBlock">
<Setter Property="LineHeight" Value="16" />
<Setter Property="Margin" Value="0,2,0,0" />
<Setter Property="Foreground" Value="{ThemeResource TextFillColorSecondaryBrush}" />
<Setter Property="TextWrapping" Value="WrapWholeWords" />
</Style>
<!-- Used for disclaimers -->
<Style x:Key="DisclaimerStyle"
TargetType="TextBlock">

29
src/cascadia/TerminalSettingsEditor/Compatibility.xaml
View File

@@ -26,18 +26,7 @@
<StackPanel Style="{StaticResource SettingsStackStyle}">
<!-- Section: Compatibility -->
<muxc:Expander IsExpanded="True"
AutomationProperties.Name="{Binding Text, ElementName=Compatibility_Section_Compatibility_Title_AccTitle}"
Style="{StaticResource SectionExpanderStyle}">
<muxc:Expander.Header>
<StackPanel Style="{StaticResource SectionExpanderHeaderStackStyle}">
<TextBlock x:Name="Compatibility_Section_Compatibility_Title_AccTitle"
x:Uid="Compatibility_Section_Compatibility_Title"
Style="{StaticResource SectionExpanderHeaderTextStyle}" />
<TextBlock x:Uid="Compatibility_Section_Compatibility_Help"
Style="{StaticResource SectionExpanderHelpTextStyle}" />
</StackPanel>
</muxc:Expander.Header>
<local:SettingContainer x:Uid="Compatibility_Section_Compatibility" StartExpanded="True" Style="{StaticResource SectionExpanderStyle}">
<StackPanel>
<!-- Allow Headless -->
<local:SettingContainer x:Name="AllowHeadless"
@@ -117,20 +106,10 @@
</Button>
</local:SettingContainer>
</StackPanel>
</muxc:Expander>
</local:SettingContainer>
<!-- Section: Rendering -->
<muxc:Expander AutomationProperties.Name="{Binding Text, ElementName=Compatibility_Section_Rendering_Title_AccTitle}"
Style="{StaticResource SectionExpanderStyle}">
<muxc:Expander.Header>
<StackPanel Style="{StaticResource SectionExpanderHeaderStackStyle}">
<TextBlock x:Name="Compatibility_Section_Rendering_Title_AccTitle"
x:Uid="Compatibility_Section_Rendering_Title"
Style="{StaticResource SectionExpanderHeaderTextStyle}" />
<TextBlock x:Uid="Compatibility_Section_Rendering_Help"
Style="{StaticResource SectionExpanderHelpTextStyle}" />
</StackPanel>
</muxc:Expander.Header>
<local:SettingContainer x:Uid="Compatibility_Section_Rendering" Style="{StaticResource SectionExpanderStyle}">
<StackPanel>
<!-- Graphics API -->
<local:SettingContainer x:Name="GraphicsAPI"
@@ -156,6 +135,6 @@
Style="{StaticResource ToggleSwitchInExpanderStyle}" />
</local:SettingContainer>
</StackPanel>
</muxc:Expander>
</local:SettingContainer>
</StackPanel>
</Page>

71
src/cascadia/TerminalSettingsEditor/GlobalAppearance.xaml
View File

@@ -28,18 +28,7 @@
<StackPanel Style="{StaticResource SettingsStackStyle}">
<!-- Section: Visual style -->
<muxc:Expander IsExpanded="True"
AutomationProperties.Name="{Binding Text, ElementName=Globals_Section_VisualStyle_Title_AccTitle}"
Style="{StaticResource SectionExpanderStyle}">
<muxc:Expander.Header>
<StackPanel Style="{StaticResource SectionExpanderHeaderStackStyle}">
<TextBlock x:Name="Globals_Section_VisualStyle_Title_AccTitle"
x:Uid="Globals_Section_VisualStyle_Title"
Style="{StaticResource SectionExpanderHeaderTextStyle}" />
<TextBlock x:Uid="Globals_Section_VisualStyle_Help"
Style="{StaticResource SectionExpanderHelpTextStyle}" />
</StackPanel>
</muxc:Expander.Header>
<local:SettingContainer x:Uid="Globals_Section_VisualStyle" StartExpanded="True" Style="{StaticResource SectionExpanderStyle}">
<StackPanel>
<!-- Theme -->
<local:SettingContainer x:Name="Theme"
@@ -78,20 +67,10 @@
Style="{StaticResource ToggleSwitchInExpanderStyle}" />
</local:SettingContainer>
</StackPanel>
</muxc:Expander>
</local:SettingContainer>
<!-- Section: Tabs and layout -->
<muxc:Expander AutomationProperties.Name="{Binding Text, ElementName=Globals_Section_TabsLayout_Title_AccTitle}"
Style="{StaticResource SectionExpanderStyle}">
<muxc:Expander.Header>
<StackPanel Style="{StaticResource SectionExpanderHeaderStackStyle}">
<TextBlock x:Name="Globals_Section_TabsLayout_Title_AccTitle"
x:Uid="Globals_Section_TabsLayout_Title"
Style="{StaticResource SectionExpanderHeaderTextStyle}" />
<TextBlock x:Uid="Globals_Section_TabsLayout_Help"
Style="{StaticResource SectionExpanderHelpTextStyle}" />
</StackPanel>
</muxc:Expander.Header>
<local:SettingContainer x:Uid="Globals_Section_TabsLayout" Style="{StaticResource SectionExpanderStyle}">
<StackPanel>
<!-- Position of new tab -->
<local:SettingContainer x:Name="NewTabPosition"
@@ -136,20 +115,10 @@
Toggled="{x:Bind ViewModel.ShowTitlebarToggled}" />
</local:SettingContainer>
</StackPanel>
</muxc:Expander>
</local:SettingContainer>
<!-- Section: Window behavior -->
<muxc:Expander AutomationProperties.Name="{Binding Text, ElementName=Globals_Section_WindowBehavior_Title_AccTitle}"
Style="{StaticResource SectionExpanderStyle}">
<muxc:Expander.Header>
<StackPanel Style="{StaticResource SectionExpanderHeaderStackStyle}">
<TextBlock x:Name="Globals_Section_WindowBehavior_Title_AccTitle"
x:Uid="Globals_Section_WindowBehavior_Title"
Style="{StaticResource SectionExpanderHeaderTextStyle}" />
<TextBlock x:Uid="Globals_Section_WindowBehavior_Help"
Style="{StaticResource SectionExpanderHelpTextStyle}" />
</StackPanel>
</muxc:Expander.Header>
<local:SettingContainer x:Uid="Globals_Section_WindowBehavior" Style="{StaticResource SectionExpanderStyle}">
<StackPanel>
<!-- Always on Top -->
<local:SettingContainer x:Name="AlwaysOnTop"
@@ -165,20 +134,10 @@
Style="{StaticResource ToggleSwitchInExpanderStyle}" />
</local:SettingContainer>
</StackPanel>
</muxc:Expander>
</local:SettingContainer>
<!-- Section: Title bar & identity -->
<muxc:Expander AutomationProperties.Name="{Binding Text, ElementName=Globals_Section_TitleBarIdentity_Title_AccTitle}"
Style="{StaticResource SectionExpanderStyle}">
<muxc:Expander.Header>
<StackPanel Style="{StaticResource SectionExpanderHeaderStackStyle}">
<TextBlock x:Name="Globals_Section_TitleBarIdentity_Title_AccTitle"
x:Uid="Globals_Section_TitleBarIdentity_Title"
Style="{StaticResource SectionExpanderHeaderTextStyle}" />
<TextBlock x:Uid="Globals_Section_TitleBarIdentity_Help"
Style="{StaticResource SectionExpanderHelpTextStyle}" />
</StackPanel>
</muxc:Expander.Header>
<local:SettingContainer x:Uid="Globals_Section_TitleBarIdentity" Style="{StaticResource SectionExpanderStyle}">
<StackPanel>
<!-- Show Title in Titlebar (use active terminal title as application title) -->
<local:SettingContainer x:Name="ShowTitleInTitlebar"
@@ -194,20 +153,10 @@
Style="{StaticResource ToggleSwitchInExpanderStyle}" />
</local:SettingContainer>
</StackPanel>
</muxc:Expander>
</local:SettingContainer>
<!-- Section: System integration & notifications -->
<muxc:Expander AutomationProperties.Name="{Binding Text, ElementName=Globals_Section_SystemIntegration_Title_AccTitle}"
Style="{StaticResource SectionExpanderStyle}">
<muxc:Expander.Header>
<StackPanel Style="{StaticResource SectionExpanderHeaderStackStyle}">
<TextBlock x:Name="Globals_Section_SystemIntegration_Title_AccTitle"
x:Uid="Globals_Section_SystemIntegration_Title"
Style="{StaticResource SectionExpanderHeaderTextStyle}" />
<TextBlock x:Uid="Globals_Section_SystemIntegration_Help"
Style="{StaticResource SectionExpanderHelpTextStyle}" />
</StackPanel>
</muxc:Expander.Header>
<local:SettingContainer x:Uid="Globals_Section_SystemIntegration" Style="{StaticResource SectionExpanderStyle}">
<StackPanel>
<!-- Always Show Notification Icon -->
<local:SettingContainer x:Name="AlwaysShowNotificationIcon"
@@ -223,6 +172,6 @@
Style="{StaticResource ToggleSwitchInExpanderStyle}" />
</local:SettingContainer>
</StackPanel>
</muxc:Expander>
</local:SettingContainer>
</StackPanel>
</Page>

85
src/cascadia/TerminalSettingsEditor/Interaction.xaml
View File

@@ -27,18 +27,7 @@
<StackPanel>
<StackPanel Style="{StaticResource SettingsStackStyle}">
<!-- Section: Clipboard and paste behavior -->
<muxc:Expander IsExpanded="True"
AutomationProperties.Name="{Binding Text, ElementName=Interaction_Section_Clipboard_Title_AccTitle}"
Style="{StaticResource SectionExpanderStyle}">
<muxc:Expander.Header>
<StackPanel Style="{StaticResource SectionExpanderHeaderStackStyle}">
<TextBlock x:Name="Interaction_Section_Clipboard_Title_AccTitle"
x:Uid="Interaction_Section_Clipboard_Title"
Style="{StaticResource SectionExpanderHeaderTextStyle}" />
<TextBlock x:Uid="Interaction_Section_Clipboard_Help"
Style="{StaticResource SectionExpanderHelpTextStyle}" />
</StackPanel>
</muxc:Expander.Header>
<local:SettingContainer x:Uid="Interaction_Section_Clipboard" StartExpanded="True" Style="{StaticResource SectionExpanderStyle}">
<StackPanel>
<!-- Copy On Select -->
<local:SettingContainer x:Name="CopyOnSelect"
@@ -71,20 +60,10 @@
Style="{StaticResource ComboBoxSettingStyle}" />
</local:SettingContainer>
</StackPanel>
</muxc:Expander>
</local:SettingContainer>
<!-- Section: Text selection & editing -->
<muxc:Expander AutomationProperties.Name="{Binding Text, ElementName=Interaction_Section_TextSelection_Title_AccTitle}"
Style="{StaticResource SectionExpanderStyle}">
<muxc:Expander.Header>
<StackPanel Style="{StaticResource SectionExpanderHeaderStackStyle}">
<TextBlock x:Name="Interaction_Section_TextSelection_Title_AccTitle"
x:Uid="Interaction_Section_TextSelection_Title"
Style="{StaticResource SectionExpanderHeaderTextStyle}" />
<TextBlock x:Uid="Interaction_Section_TextSelection_Help"
Style="{StaticResource SectionExpanderHelpTextStyle}" />
</StackPanel>
</muxc:Expander.Header>
<local:SettingContainer x:Uid="Interaction_Section_TextSelection" Style="{StaticResource SectionExpanderStyle}">
<StackPanel>
<!-- Word Delimiters -->
<local:SettingContainer x:Name="WordDelimiters"
@@ -103,20 +82,10 @@
Style="{StaticResource ToggleSwitchInExpanderStyle}" />
</local:SettingContainer>
</StackPanel>
</muxc:Expander>
</local:SettingContainer>
<!-- Section: Window and layout behavior -->
<muxc:Expander AutomationProperties.Name="{Binding Text, ElementName=Interaction_Section_WindowLayout_Title_AccTitle}"
Style="{StaticResource SectionExpanderStyle}">
<muxc:Expander.Header>
<StackPanel Style="{StaticResource SectionExpanderHeaderStackStyle}">
<TextBlock x:Name="Interaction_Section_WindowLayout_Title_AccTitle"
x:Uid="Interaction_Section_WindowLayout_Title"
Style="{StaticResource SectionExpanderHeaderTextStyle}" />
<TextBlock x:Uid="Interaction_Section_WindowLayout_Help"
Style="{StaticResource SectionExpanderHelpTextStyle}" />
</StackPanel>
</muxc:Expander.Header>
<local:SettingContainer x:Uid="Interaction_Section_WindowLayout" Style="{StaticResource SectionExpanderStyle}">
<StackPanel>
<!-- Snap On Resize -->
<local:SettingContainer x:Name="SnapToGridOnResize"
@@ -142,20 +111,10 @@
Style="{StaticResource ComboBoxSettingStyle}" />
</local:SettingContainer>
</StackPanel>
</muxc:Expander>
</local:SettingContainer>
<!-- Section: Mouse & scrolling -->
<muxc:Expander AutomationProperties.Name="{Binding Text, ElementName=Interaction_Section_MouseScrolling_Title_AccTitle}"
Style="{StaticResource SectionExpanderStyle}">
<muxc:Expander.Header>
<StackPanel Style="{StaticResource SectionExpanderHeaderStackStyle}">
<TextBlock x:Name="Interaction_Section_MouseScrolling_Title_AccTitle"
x:Uid="Interaction_Section_MouseScrolling_Title"
Style="{StaticResource SectionExpanderHeaderTextStyle}" />
<TextBlock x:Uid="Interaction_Section_MouseScrolling_Help"
Style="{StaticResource SectionExpanderHelpTextStyle}" />
</StackPanel>
</muxc:Expander.Header>
<local:SettingContainer x:Uid="Interaction_Section_MouseScrolling" Style="{StaticResource SectionExpanderStyle}">
<StackPanel>
<!-- Enable Font Size Changes with Scrolling -->
<local:SettingContainer x:Name="ScrollToZoom"
@@ -171,20 +130,10 @@
Style="{StaticResource ToggleSwitchInExpanderStyle}" />
</local:SettingContainer>
</StackPanel>
</muxc:Expander>
</local:SettingContainer>
<!-- Section: URLs & external actions -->
<muxc:Expander AutomationProperties.Name="{Binding Text, ElementName=Interaction_Section_UrlsExternal_Title_AccTitle}"
Style="{StaticResource SectionExpanderStyle}">
<muxc:Expander.Header>
<StackPanel Style="{StaticResource SectionExpanderHeaderStackStyle}">
<TextBlock x:Name="Interaction_Section_UrlsExternal_Title_AccTitle"
x:Uid="Interaction_Section_UrlsExternal_Title"
Style="{StaticResource SectionExpanderHeaderTextStyle}" />
<TextBlock x:Uid="Interaction_Section_UrlsExternal_Help"
Style="{StaticResource SectionExpanderHelpTextStyle}" />
</StackPanel>
</muxc:Expander.Header>
<local:SettingContainer x:Uid="Interaction_Section_UrlsExternal" Style="{StaticResource SectionExpanderStyle}">
<StackPanel>
<!-- Detect URLs -->
<local:SettingContainer x:Name="DetectURLs"
@@ -203,20 +152,10 @@
Text="{x:Bind ViewModel.SearchWebDefaultQueryUrl, Mode=TwoWay}" />
</local:SettingContainer>
</StackPanel>
</muxc:Expander>
</local:SettingContainer>
<!-- Section: Warnings -->
<muxc:Expander AutomationProperties.Name="{Binding Text, ElementName=Interaction_Section_Warnings_Title_AccTitle}"
Style="{StaticResource SectionExpanderStyle}">
<muxc:Expander.Header>
<StackPanel Style="{StaticResource SectionExpanderHeaderStackStyle}">
<TextBlock x:Name="Interaction_Section_Warnings_Title_AccTitle"
x:Uid="Interaction_Section_Warnings_Title"
Style="{StaticResource SectionExpanderHeaderTextStyle}" />
<TextBlock x:Uid="Interaction_Section_Warnings_Help"
Style="{StaticResource SectionExpanderHelpTextStyle}" />
</StackPanel>
</muxc:Expander.Header>
<local:SettingContainer x:Uid="Interaction_Section_Warnings" Style="{StaticResource SectionExpanderStyle}">
<StackPanel>
<!-- Confirm Close On -->
<local:SettingContainer x:Name="ConfirmOnClose"
@@ -252,7 +191,7 @@
Style="{StaticResource ComboBoxSettingStyle}" />
</local:SettingContainer>
</StackPanel>
</muxc:Expander>
</local:SettingContainer>
</StackPanel>
</StackPanel>
</Page>

29
src/cascadia/TerminalSettingsEditor/Launch.xaml
View File

@@ -44,18 +44,7 @@
<StackPanel>
<StackPanel Style="{StaticResource SettingsStackStyle}">
<!-- Section: Launch behavior -->
<muxc:Expander IsExpanded="True"
AutomationProperties.Name="{Binding Text, ElementName=Launch_Section_LaunchBehavior_Title_AccTitle}"
Style="{StaticResource SectionExpanderStyle}">
<muxc:Expander.Header>
<StackPanel Style="{StaticResource SectionExpanderHeaderStackStyle}">
<TextBlock x:Name="Launch_Section_LaunchBehavior_Title_AccTitle"
x:Uid="Launch_Section_LaunchBehavior_Title"
Style="{StaticResource SectionExpanderHeaderTextStyle}" />
<TextBlock x:Uid="Launch_Section_LaunchBehavior_Help"
Style="{StaticResource SectionExpanderHelpTextStyle}" />
</StackPanel>
</muxc:Expander.Header>
<local:SettingContainer x:Uid="Launch_Section_LaunchBehavior" StartExpanded="True" Style="{StaticResource SectionExpanderStyle}">
<StackPanel>
<!-- Default Profile -->
<local:SettingContainer x:Name="DefaultProfile"
@@ -242,20 +231,10 @@
</Grid>
</local:SettingContainer>
</StackPanel>
</muxc:Expander>
</local:SettingContainer>
<!-- Section: System & input defaults -->
<muxc:Expander AutomationProperties.Name="{Binding Text, ElementName=Launch_Section_SystemInputDefaults_Title_AccTitle}"
Style="{StaticResource SectionExpanderStyle}">
<muxc:Expander.Header>
<StackPanel Style="{StaticResource SectionExpanderHeaderStackStyle}">
<TextBlock x:Name="Launch_Section_SystemInputDefaults_Title_AccTitle"
x:Uid="Launch_Section_SystemInputDefaults_Title"
Style="{StaticResource SectionExpanderHeaderTextStyle}" />
<TextBlock x:Uid="Launch_Section_SystemInputDefaults_Help"
Style="{StaticResource SectionExpanderHelpTextStyle}" />
</StackPanel>
</muxc:Expander.Header>
<local:SettingContainer x:Uid="Launch_Section_SystemInputDefaults" Style="{StaticResource SectionExpanderStyle}">
<StackPanel>
<!-- Default Terminal -->
<local:SettingContainer x:Name="DefaultTerminalDropdown"
@@ -346,7 +325,7 @@
Style="{StaticResource ComboBoxSettingStyle}" />
</local:SettingContainer>
</StackPanel>
</muxc:Expander>
</local:SettingContainer>
</StackPanel>
</StackPanel>
</Page>

12
src/cascadia/TerminalSettingsEditor/Profiles_Appearance.xaml
View File

@@ -81,15 +81,7 @@
WindowRoot="{x:Bind WindowRoot, Mode=OneTime}" />
<!-- Section: Window settings -->
<muxc:Expander AutomationProperties.Name="{Binding Text, ElementName=Profile_Section_Window_Title_AccTitle}"
Style="{StaticResource SectionExpanderStyle}">
<muxc:Expander.Header>
<StackPanel Style="{StaticResource SectionExpanderHeaderStackStyle}">
<TextBlock x:Name="Profile_Section_Window_Title_AccTitle"
x:Uid="Profile_Section_Window_Title"
Style="{StaticResource SectionExpanderHeaderTextStyle}" />
</StackPanel>
</muxc:Expander.Header>
<local:SettingContainer x:Uid="Profile_Section_Window" Style="{StaticResource SectionExpanderStyle}">
<StackPanel>
<!-- Opacity -->
<local:SettingContainer x:Name="Opacity"
@@ -204,7 +196,7 @@
Style="{StaticResource ComboBoxSettingStyle}" />
</local:SettingContainer>
</StackPanel>
</muxc:Expander>
</local:SettingContainer>
<StackPanel MaxWidth="{StaticResource StandardControlMaxWidth}">
<StackPanel Orientation="Horizontal"
Visibility="{x:Bind Profile.EditableUnfocusedAppearance, Mode=OneWay}">

24
src/cascadia/TerminalSettingsEditor/Profiles_Base.xaml
View File

@@ -35,15 +35,7 @@
Style="{StaticResource SettingsStackStyle}">
<!-- Section: {Profile.Name} profile (or "Profile defaults") -->
<muxc:Expander IsExpanded="True"
AutomationProperties.Name="{x:Bind Profile.SectionHeaderText, Mode=OneWay}"
Style="{StaticResource SectionExpanderStyle}">
<muxc:Expander.Header>
<StackPanel Style="{StaticResource SectionExpanderHeaderStackStyle}">
<TextBlock Style="{StaticResource SectionExpanderHeaderTextStyle}"
Text="{x:Bind Profile.SectionHeaderText, Mode=OneWay}" />
</StackPanel>
</muxc:Expander.Header>
<local:SettingContainer x:Uid="Profile_Section_HeaderPlaceholder" Header="{x:Bind Profile.SectionHeaderText, Mode=OneWay}" StartExpanded="True" Style="{StaticResource SectionExpanderStyle}">
<StackPanel>
<!-- Name -->
<!--
@@ -120,18 +112,10 @@
Style="{StaticResource ToggleSwitchInExpanderStyle}" />
</local:SettingContainer>
</StackPanel>
</muxc:Expander>
</local:SettingContainer>
<!-- Section: Visual/UI Affordance -->
<muxc:Expander AutomationProperties.Name="{Binding Text, ElementName=Profile_Section_VisualUI_Title_AccTitle}"
Style="{StaticResource SectionExpanderStyle}">
<muxc:Expander.Header>
<StackPanel Style="{StaticResource SectionExpanderHeaderStackStyle}">
<TextBlock x:Name="Profile_Section_VisualUI_Title_AccTitle"
x:Uid="Profile_Section_VisualUI_Title"
Style="{StaticResource SectionExpanderHeaderTextStyle}" />
</StackPanel>
</muxc:Expander.Header>
<local:SettingContainer x:Uid="Profile_Section_VisualUI" Style="{StaticResource SectionExpanderStyle}">
<StackPanel>
<!-- Tab Title -->
<local:SettingContainer x:Name="TabTitle"
@@ -199,7 +183,7 @@
Style="{StaticResource ToggleSwitchInExpanderStyle}" />
</local:SettingContainer>
</StackPanel>
</muxc:Expander>
</local:SettingContainer>
<TextBlock x:Uid="Profile_AdditionalSettingsHeader"
Margin="0,32,0,4"

76
src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw
View File

@@ -2768,131 +2768,131 @@
<value>This text will be inserted between the paths of multiple files dropped into the terminal.</value>
<comment>A description for what the "drag drop delimiter" setting does.</comment>
</data>
<data name="Launch_Section_LaunchBehavior_Title.Text" xml:space="preserve">
<data name="Launch_Section_LaunchBehavior.Header" xml:space="preserve">
<value>Launch behavior</value>
<comment>Title of a section that groups settings that control how the terminal opens and behaves when launched.</comment>
</data>
<data name="Launch_Section_LaunchBehavior_Help.Text" xml:space="preserve">
<data name="Launch_Section_LaunchBehavior.HelpText" xml:space="preserve">
<value>Control how the terminal opens and behaves when its launched.</value>
<comment>Description for the "Launch behavior" section.</comment>
</data>
<data name="Launch_Section_SystemInputDefaults_Title.Text" xml:space="preserve">
<data name="Launch_Section_SystemInputDefaults.Header" xml:space="preserve">
<value>System &amp; input defaults</value>
<comment>Title of a section that groups settings for default system and input behaviors.</comment>
</data>
<data name="Launch_Section_SystemInputDefaults_Help.Text" xml:space="preserve">
<data name="Launch_Section_SystemInputDefaults.HelpText" xml:space="preserve">
<value>Set default system and input behaviors that apply when the terminal starts and integrates with Windows.</value>
<comment>Description for the "System &amp; input defaults" section.</comment>
</data>
<data name="Interaction_Section_Clipboard_Title.Text" xml:space="preserve">
<data name="Interaction_Section_Clipboard.Header" xml:space="preserve">
<value>Clipboard and paste behavior</value>
<comment>Title of a section that groups settings related to selection, copying, and pasting.</comment>
</data>
<data name="Interaction_Section_Clipboard_Help.Text" xml:space="preserve">
<data name="Interaction_Section_Clipboard.HelpText" xml:space="preserve">
<value>Controls how Terminal responds to common user actions, including selection, copying, and pasting.</value>
<comment>Description for the "Clipboard and paste behavior" section.</comment>
</data>
<data name="Interaction_Section_TextSelection_Title.Text" xml:space="preserve">
<data name="Interaction_Section_TextSelection.Header" xml:space="preserve">
<value>Text selection &amp; editing</value>
<comment>Title of a section that groups settings related to text selection and editing.</comment>
</data>
<data name="Interaction_Section_TextSelection_Help.Text" xml:space="preserve">
<data name="Interaction_Section_TextSelection.HelpText" xml:space="preserve">
<value>Controls how text is selected, edited, and formatted within the terminal.</value>
<comment>Description for the "Text selection &amp; editing" section.</comment>
</data>
<data name="Interaction_Section_WindowLayout_Title.Text" xml:space="preserve">
<data name="Interaction_Section_WindowLayout.Header" xml:space="preserve">
<value>Window and layout behavior</value>
<comment>Title of a section that groups settings related to window sizing, arrangement, and grouping.</comment>
</data>
<data name="Interaction_Section_WindowLayout_Help.Text" xml:space="preserve">
<data name="Interaction_Section_WindowLayout.HelpText" xml:space="preserve">
<value>Control how terminal windows are sized, arranged, and grouped.</value>
<comment>Description for the "Window and layout behavior" section.</comment>
</data>
<data name="Interaction_Section_MouseScrolling_Title.Text" xml:space="preserve">
<data name="Interaction_Section_MouseScrolling.Header" xml:space="preserve">
<value>Mouse &amp; scrolling</value>
<comment>Title of a section that groups settings related to mouse and scroll wheel input.</comment>
</data>
<data name="Interaction_Section_MouseScrolling_Help.Text" xml:space="preserve">
<data name="Interaction_Section_MouseScrolling.HelpText" xml:space="preserve">
<value>Configure how mouse and scroll wheel input affect the terminal.</value>
<comment>Description for the "Mouse &amp; scrolling" section.</comment>
</data>
<data name="Interaction_Section_UrlsExternal_Title.Text" xml:space="preserve">
<data name="Interaction_Section_UrlsExternal.Header" xml:space="preserve">
<value>URLs &amp; external actions</value>
<comment>Title of a section that groups settings related to URLs and external app actions.</comment>
</data>
<data name="Interaction_Section_UrlsExternal_Help.Text" xml:space="preserve">
<data name="Interaction_Section_UrlsExternal.HelpText" xml:space="preserve">
<value>Manage how Terminal handles links and triggers actions in external apps.</value>
<comment>Description for the "URLs &amp; external actions" section.</comment>
</data>
<data name="Interaction_Section_Warnings_Title.Text" xml:space="preserve">
<data name="Interaction_Section_Warnings.Header" xml:space="preserve">
<value>Warnings</value>
<comment>Title of a section that groups warning-related settings.</comment>
</data>
<data name="Interaction_Section_Warnings_Help.Text" xml:space="preserve">
<data name="Interaction_Section_Warnings.HelpText" xml:space="preserve">
<value>Choose when Terminal should alert you before potentially disruptive actions.</value>
<comment>Description for the "Warnings" section.</comment>
</data>
<data name="Globals_Section_VisualStyle_Title.Text" xml:space="preserve">
<data name="Globals_Section_VisualStyle.Header" xml:space="preserve">
<value>Visual style</value>
<comment>Title of a section that groups settings related to the terminal's visual appearance.</comment>
</data>
<data name="Globals_Section_VisualStyle_Help.Text" xml:space="preserve">
<data name="Globals_Section_VisualStyle.HelpText" xml:space="preserve">
<value>Control the terminal's visual appearance</value>
<comment>Description for the "Visual style" section.</comment>
</data>
<data name="Globals_Section_TabsLayout_Title.Text" xml:space="preserve">
<data name="Globals_Section_TabsLayout.Header" xml:space="preserve">
<value>Tabs and layout</value>
<comment>Title of a section that groups settings related to tabs and pane layout.</comment>
</data>
<data name="Globals_Section_TabsLayout_Help.Text" xml:space="preserve">
<data name="Globals_Section_TabsLayout.HelpText" xml:space="preserve">
<value>Manage how tabs and panes are organized, resized, and navigated.</value>
<comment>Description for the "Tabs and layout" section.</comment>
</data>
<data name="Globals_Section_WindowBehavior_Title.Text" xml:space="preserve">
<data name="Globals_Section_WindowBehavior.Header" xml:space="preserve">
<value>Window behavior</value>
<comment>Title of a section that groups settings related to terminal window behavior.</comment>
</data>
<data name="Globals_Section_WindowBehavior_Help.Text" xml:space="preserve">
<data name="Globals_Section_WindowBehavior.HelpText" xml:space="preserve">
<value>Manage terminal window behavior.</value>
<comment>Description for the "Window behavior" section.</comment>
</data>
<data name="Globals_Section_TitleBarIdentity_Title.Text" xml:space="preserve">
<data name="Globals_Section_TitleBarIdentity.Header" xml:space="preserve">
<value>Title bar &amp; identity</value>
<comment>Title of a section that groups settings related to title bar identity and indicators.</comment>
</data>
<data name="Globals_Section_TitleBarIdentity_Help.Text" xml:space="preserve">
<data name="Globals_Section_TitleBarIdentity.HelpText" xml:space="preserve">
<value>Manage title bar identity and indicators</value>
<comment>Description for the "Title bar &amp; identity" section.</comment>
</data>
<data name="Globals_Section_SystemIntegration_Title.Text" xml:space="preserve">
<data name="Globals_Section_SystemIntegration.Header" xml:space="preserve">
<value>System integration &amp; notifications</value>
<comment>Title of a section that groups settings related to system integration and notifications.</comment>
</data>
<data name="Globals_Section_SystemIntegration_Help.Text" xml:space="preserve">
<data name="Globals_Section_SystemIntegration.HelpText" xml:space="preserve">
<value>Control how the terminal integrates with Windows and how system-level notifications are shown.</value>
<comment>Description for the "System integration &amp; notifications" section.</comment>
</data>
<data name="Compatibility_Section_Compatibility_Title.Text" xml:space="preserve">
<data name="Compatibility_Section_Compatibility.Header" xml:space="preserve">
<value>Compatibility</value>
<comment>Title of a section that groups compatibility-related settings.</comment>
</data>
<data name="Compatibility_Section_Compatibility_Help.Text" xml:space="preserve">
<data name="Compatibility_Section_Compatibility.HelpText" xml:space="preserve">
<value>Settings for troubleshooting and supporting different command-line tools.</value>
<comment>Description for the "Compatibility" section.</comment>
</data>
<data name="Compatibility_Section_Rendering_Title.Text" xml:space="preserve">
<data name="Compatibility_Section_Rendering.Header" xml:space="preserve">
<value>Rendering</value>
<comment>Title of a section that groups rendering-related settings.</comment>
</data>
<data name="Compatibility_Section_Rendering_Help.Text" xml:space="preserve">
<data name="Compatibility_Section_Rendering.HelpText" xml:space="preserve">
<value>Rendering controls the terminal's drawing behavior.</value>
<comment>Description for the "Rendering" section.</comment>
</data>
<data name="Profile_Section_VisualUI_Title.Text" xml:space="preserve">
<data name="Profile_Section_VisualUI.Header" xml:space="preserve">
<value>Visual/UI Affordance</value>
<comment>Title of a section in a profile page that groups visual and UI settings (tab title, icon, tab color, etc.).</comment>
</data>
<data name="Profile_Section_Window_Title.Text" xml:space="preserve">
<data name="Profile_Section_Window.Header" xml:space="preserve">
<value>Window settings</value>
<comment>Title of a section expander on the Profile Appearance page that groups window-level appearance settings (background opacity, acrylic, padding, scrollbar visibility).</comment>
</data>
@@ -2904,27 +2904,27 @@
<value>Profile defaults</value>
<comment>Header used in place of the "{name} profile" header when the page is showing the profile-defaults layer (which has no profile name).</comment>
</data>
<data name="Appearance_Section_Typography_Title.Text" xml:space="preserve">
<data name="Appearance_Section_Typography.Header" xml:space="preserve">
<value>Typography settings</value>
<comment>Title of a section that groups settings controlling how text looks in a profile.</comment>
</data>
<data name="Appearance_Section_Typography_Help.Text" xml:space="preserve">
<data name="Appearance_Section_Typography.HelpText" xml:space="preserve">
<value>Choose how text looks in this profile, including the font, size, and more advanced options.</value>
<comment>Description for the "Typography settings" section.</comment>
</data>
<data name="Appearance_Section_Cursor_Title.Text" xml:space="preserve">
<data name="Appearance_Section_Cursor.Header" xml:space="preserve">
<value>Cursor settings</value>
<comment>Title of a section that groups settings controlling the cursor.</comment>
</data>
<data name="Appearance_Section_Cursor_Help.Text" xml:space="preserve">
<data name="Appearance_Section_Cursor.HelpText" xml:space="preserve">
<value>Customize how the text cursor looks and behaves while typing in this profile.</value>
<comment>Description for the "Cursor settings" section.</comment>
</data>
<data name="Appearance_Section_BackgroundImage_Title.Text" xml:space="preserve">
<data name="Appearance_Section_BackgroundImage.Header" xml:space="preserve">
<value>Background image</value>
<comment>Title of a section that groups settings controlling the background image.</comment>
</data>
<data name="Appearance_Section_BackgroundImage_Help.Text" xml:space="preserve">
<data name="Appearance_Section_BackgroundImage.HelpText" xml:space="preserve">
<value>Select a background image to personalize the look of your terminal.</value>
<comment>Description for the "Background image" section.</comment>
</data>

2
src/cascadia/TerminalSettingsEditor/SettingContainer.cpp
View File

@@ -159,7 +159,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
// apply header and current value as name (automation property)
Automation::AutomationProperties::SetName(obj, _GenerateAccessibleName());
// apply help text as tooltip and full description (automation property)
// apply help text as full description (automation property)
if (const auto& helpText{ HelpText() }; !helpText.empty())
{
Automation::AutomationProperties::SetFullDescription(obj, helpText);

57
src/cascadia/TerminalSettingsEditor/SettingContainerStyle.xaml
View File

@@ -580,4 +580,61 @@
</Setter>
</Style>
<!--
A "section" container that groups related SettingContainers under a
collapsible header.
-->
<Style x:Key="SectionExpanderHeaderTextStyle"
BasedOn="{StaticResource BodyTextBlockStyle}"
TargetType="TextBlock">
<Setter Property="VerticalAlignment" Value="Center" />
</Style>
<Style x:Key="SectionExpanderHelpTextStyle"
BasedOn="{StaticResource CaptionTextBlockStyle}"
TargetType="TextBlock">
<Setter Property="LineHeight" Value="16" />
<Setter Property="Margin" Value="0,2,0,0" />
<Setter Property="Foreground" Value="{ThemeResource TextFillColorSecondaryBrush}" />
<Setter Property="TextWrapping" Value="WrapWholeWords" />
</Style>
<Style x:Key="SectionExpanderStyle"
TargetType="local:SettingContainer">
<Setter Property="MaxWidth" Value="1000" />
<Setter Property="Margin" Value="0,12,0,0" />
<Setter Property="HorizontalAlignment" Value="Stretch" />
<Setter Property="HorizontalContentAlignment" Value="Stretch" />
<Setter Property="IsTabStop" Value="False" />
<Setter Property="AutomationProperties.AccessibilityView" Value="Raw" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="local:SettingContainer">
<muxc:Expander x:Name="Expander"
HorizontalAlignment="Stretch"
HorizontalContentAlignment="Stretch"
Content="{TemplateBinding Content}"
IsExpanded="{TemplateBinding StartExpanded}">
<muxc:Expander.Resources>
<!-- Reduce top content padding so the gap between the header and the
first SettingContainer matches the 4 px gap between adjacent rows. -->
<Thickness x:Key="ExpanderContentPadding">16,0,16,16</Thickness>
</muxc:Expander.Resources>
<muxc:Expander.Header>
<StackPanel MinHeight="64"
Padding="0,12,0,12"
VerticalAlignment="Center">
<TextBlock Style="{StaticResource SectionExpanderHeaderTextStyle}"
Text="{TemplateBinding Header}" />
<TextBlock x:Name="HelpTextBlock"
Style="{StaticResource SectionExpanderHelpTextStyle}"
Text="{TemplateBinding HelpText}" />
</StackPanel>
</muxc:Expander.Header>
</muxc:Expander>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
</ResourceDictionary>

3
tools/GenerateSettingsIndex.ps1
View File

@@ -23,7 +23,8 @@ $ProhibitedUids = @(
"Profile_ProportionalFontFaces",
"ColorScheme_InboxSchemeDuplicate",
"ColorScheme_ColorsHeader",
"ColorScheme_Rename"
"ColorScheme_Rename",
"Profile_Section_HeaderPlaceholder"
)
# Prohibited XAML files (already limited to Page root elements)