diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
new file mode 100644
index 000000000..2c4e940b5
--- /dev/null
+++ b/.config/dotnet-tools.json
@@ -0,0 +1,12 @@
+{
+ "version": 1,
+ "isRoot": true,
+ "tools": {
+ "XamlStyler.Console": {
+ "version": "3.2008.4",
+ "commands": [
+ "xstyler"
+ ]
+ }
+ }
+}
diff --git a/.github/actions/spelling/excludes.txt b/.github/actions/spelling/excludes.txt
index 0b9616e30..8931e1ac6 100644
--- a/.github/actions/spelling/excludes.txt
+++ b/.github/actions/spelling/excludes.txt
@@ -64,3 +64,4 @@ SUMS$
^\.github/actions/spelling/
^\.gitignore$
^doc/reference/master-sequence-list.csv$
+^\XamlStyler.json$
diff --git a/.github/actions/spelling/expect/expect.txt b/.github/actions/spelling/expect/expect.txt
index 639ca0ed0..77b95664d 100644
--- a/.github/actions/spelling/expect/expect.txt
+++ b/.github/actions/spelling/expect/expect.txt
@@ -2061,6 +2061,7 @@ runtests
runtimeclass
runuia
runut
+runxamlformat
rvalue
RVERTICAL
rxvt
@@ -2852,6 +2853,7 @@ XResource
xsd
xsi
xsize
+xstyler
XSubstantial
xtended
xterm
diff --git a/.nuget/packages.config b/.nuget/packages.config
index 6b13d8479..fd940a873 100644
--- a/.nuget/packages.config
+++ b/.nuget/packages.config
@@ -1,4 +1,4 @@
-
\ No newline at end of file
+
diff --git a/XamlStyler.json b/XamlStyler.json
new file mode 100644
index 000000000..7981bbfd5
--- /dev/null
+++ b/XamlStyler.json
@@ -0,0 +1,41 @@
+{
+ "AttributesTolerance": 1,
+ "KeepFirstAttributeOnSameLine": true,
+ "MaxAttributeCharactersPerLine": 0,
+ "MaxAttributesPerLine": 1,
+ "NewlineExemptionElements": "RadialGradientBrush, GradientStop, LinearGradientBrush, ScaleTransform, SkewTransform, RotateTransform, TranslateTransform, Trigger, Condition, Setter",
+ "SeparateByGroups": false,
+ "AttributeIndentation": 0,
+ "AttributeIndentationStyle": 1,
+ "RemoveDesignTimeReferences": false,
+ "EnableAttributeReordering": true,
+ "AttributeOrderingRuleGroups": [
+ "x:Class",
+ "xmlns, xmlns:x",
+ "xmlns:*",
+ "x:Key, Key, x:Name, Name, x:Uid, Uid, Title",
+ "Grid.Row, Grid.RowSpan, Grid.Column, Grid.ColumnSpan, Canvas.Left, Canvas.Top, Canvas.Right, Canvas.Bottom",
+ "Width, Height, MinWidth, MinHeight, MaxWidth, MaxHeight",
+ "Margin, Padding, HorizontalAlignment, VerticalAlignment, HorizontalContentAlignment, VerticalContentAlignment, Panel.ZIndex",
+ "*:*, *",
+ "PageSource, PageIndex, Offset, Color, TargetName, Property, Value, StartPoint, EndPoint",
+ "mc:Ignorable, d:IsDataSource, d:LayoutOverrides, d:IsStaticText",
+ "Storyboard.*, From, To, Duration"
+ ],
+ "FirstLineAttributes": "",
+ "OrderAttributesByName": true,
+ "PutEndingBracketOnNewLine": false,
+ "RemoveEndingTagOfEmptyElement": true,
+ "SpaceBeforeClosingSlash": true,
+ "RootElementLineBreakRule": 0,
+ "ReorderVSM": 2,
+ "ReorderGridChildren": false,
+ "ReorderCanvasChildren": false,
+ "ReorderSetters": 0,
+ "FormatMarkupExtension": true,
+ "NoNewLineMarkupExtensions": "x:Bind, Binding",
+ "ThicknessSeparator": 2,
+ "ThicknessAttributes": "Margin, Padding, BorderThickness, ThumbnailClipMargin",
+ "FormatOnSave": true,
+ "CommentPadding": 2,
+}
diff --git a/build/scripts/Invoke-FormattingCheck.ps1 b/build/scripts/Invoke-FormattingCheck.ps1
index 8cb8e5f8a..eb5cb3eaa 100644
--- a/build/scripts/Invoke-FormattingCheck.ps1
+++ b/build/scripts/Invoke-FormattingCheck.ps1
@@ -3,12 +3,24 @@
# Checks for code formatting errors. Will throw exception if any are found.
function Invoke-CheckBadCodeFormatting() {
Import-Module ./tools/OpenConsole.psm1
- Invoke-CodeFormat
+
+ # Don't run the XAML formatter in this step - even if it changes nothing,
+ # it'll still touch all the .xaml files.
+ Invoke-CodeFormat -IgnoreXaml
+
# returns a non-zero exit code if there are any diffs in the tracked files in the repo
git diff-index --quiet HEAD --
if ($lastExitCode -eq 1) {
+
+ # Write the list of files that need updating to the log
+ git diff-index --name-only HEAD
+
throw "code formatting bad, run Invoke-CodeFormat on branch"
}
+
+ # Manually check the formatting of our .xaml files, without touching them.
+ Verify-XamlFormat
+
}
Invoke-CheckBadCodeFormatting
diff --git a/consolegit2gitfilters.json b/consolegit2gitfilters.json
index e6267ee92..5a760692b 100644
--- a/consolegit2gitfilters.json
+++ b/consolegit2gitfilters.json
@@ -38,6 +38,7 @@
".wrn",
".rec",
".err",
+ "XamlStyler.json",
".xlsx"
]
}
diff --git a/samples/ConPTY/GUIConsole/GUIConsole.WPF/App.xaml b/samples/ConPTY/GUIConsole/GUIConsole.WPF/App.xaml
index e95139446..2e0fb07ef 100644
--- a/samples/ConPTY/GUIConsole/GUIConsole.WPF/App.xaml
+++ b/samples/ConPTY/GUIConsole/GUIConsole.WPF/App.xaml
@@ -1,8 +1,6 @@
-
-
-
-
-
+
+
+
diff --git a/samples/ConPTY/GUIConsole/GUIConsole.WPF/MainWindow.xaml b/samples/ConPTY/GUIConsole/GUIConsole.WPF/MainWindow.xaml
index 766abcfca..2c67f1cb0 100644
--- a/samples/ConPTY/GUIConsole/GUIConsole.WPF/MainWindow.xaml
+++ b/samples/ConPTY/GUIConsole/GUIConsole.WPF/MainWindow.xaml
@@ -1,84 +1,100 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- GUIConsole
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ GUIConsole
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/cascadia/LocalTests_TerminalApp/TestHostApp/UnitTestApp.xaml b/src/cascadia/LocalTests_TerminalApp/TestHostApp/UnitTestApp.xaml
index 8cd18f278..25415a7d5 100644
--- a/src/cascadia/LocalTests_TerminalApp/TestHostApp/UnitTestApp.xaml
+++ b/src/cascadia/LocalTests_TerminalApp/TestHostApp/UnitTestApp.xaml
@@ -1,8 +1,5 @@
-
-
-
+
diff --git a/src/cascadia/TerminalApp/App.xaml b/src/cascadia/TerminalApp/App.xaml
index a12620b8d..77bfe5cec 100644
--- a/src/cascadia/TerminalApp/App.xaml
+++ b/src/cascadia/TerminalApp/App.xaml
@@ -1,52 +1,63 @@
-
-
-
+
+
+
-
-
+
+
-
-
-
-
+
+
-
+
8,0,0,0
-
-
+
+
-
-
+
+
diff --git a/src/cascadia/TerminalApp/ColorPickupFlyout.xaml b/src/cascadia/TerminalApp/ColorPickupFlyout.xaml
index 197e90134..7674b357e 100644
--- a/src/cascadia/TerminalApp/ColorPickupFlyout.xaml
+++ b/src/cascadia/TerminalApp/ColorPickupFlyout.xaml
@@ -1,146 +1,193 @@
-
+
-
+
-
-
+
-
-
-
-
+
+
-
+
-
-
+ Grid.Row="0"
+ ColorChanged="ColorPicker_ColorChanged"
+ FontSize="10"
+ IsAlphaEnabled="False"
+ IsAlphaSliderVisible="False"
+ IsAlphaTextInputVisible="False"
+ IsColorChannelTextInputVisible="True"
+ IsColorSliderVisible="True"
+ IsHexInputVisible="True"
+ IsMoreButtonVisible="True" />
+
diff --git a/src/cascadia/TerminalApp/CommandPalette.xaml b/src/cascadia/TerminalApp/CommandPalette.xaml
index 3cb8f65c4..3fbc4490e 100644
--- a/src/cascadia/TerminalApp/CommandPalette.xaml
+++ b/src/cascadia/TerminalApp/CommandPalette.xaml
@@ -1,490 +1,500 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/cascadia/TerminalApp/HighlightedTextControl.xaml b/src/cascadia/TerminalApp/HighlightedTextControl.xaml
index f1d89c864..deb34cf72 100644
--- a/src/cascadia/TerminalApp/HighlightedTextControl.xaml
+++ b/src/cascadia/TerminalApp/HighlightedTextControl.xaml
@@ -1,13 +1,11 @@
-
+
-
+
diff --git a/src/cascadia/TerminalApp/MinMaxCloseControl.xaml b/src/cascadia/TerminalApp/MinMaxCloseControl.xaml
index d84de6b65..43e8d3ecd 100644
--- a/src/cascadia/TerminalApp/MinMaxCloseControl.xaml
+++ b/src/cascadia/TerminalApp/MinMaxCloseControl.xaml
@@ -1,86 +1,129 @@
-
-
+
+
1.0
-
-
-
-
-
-
-
+
+
+
+
+
+
+
Transparent
-
-
-
-
+
+
+
+
1.0
-
-
-
-
-
-
-
+
+
+
+
+
+
+
Transparent
-
-
-
-
+
+
+
+
3.0
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+ M 0 0 L 10 10 M 10 0 L 0 10
+ M 0 0 L 10 10 M 10 0 L 0 10
-
+
36.0
32.0
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
-
+
+
+
+
-
-
-
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
-
+
+
+
+
-
-
-
+
+
+
-
-
@@ -151,38 +227,44 @@
-
-
-
+
+
-
+ IsChecked="True"
+ Style="{StaticResource ToggleButtonStyle}">
+
-
+ Click="GoForwardClicked"
+ Style="{StaticResource ToggleButtonStyle}">
+
-
+
-
+
diff --git a/src/cascadia/TerminalControl/TSFInputControl.xaml b/src/cascadia/TerminalControl/TSFInputControl.xaml
index 2633bbd12..bc7fca22b 100644
--- a/src/cascadia/TerminalControl/TSFInputControl.xaml
+++ b/src/cascadia/TerminalControl/TSFInputControl.xaml
@@ -1,18 +1,17 @@
-
+
diff --git a/src/cascadia/TerminalControl/TermControl.xaml b/src/cascadia/TerminalControl/TermControl.xaml
index ac642b037..9e2aecbc5 100644
--- a/src/cascadia/TerminalControl/TermControl.xaml
+++ b/src/cascadia/TerminalControl/TermControl.xaml
@@ -1,30 +1,31 @@
-
-
+
+
+ Visibility="Visible">
+ CompositionScaleChanged="_SwapChainScaleChanged"
+ SizeChanged="_SwapChainSizeChanged">
-
+
+ Visibility="Collapsed" />
-
+ PointerReleased="_ReleasePointerCapture"
+ SmallChange="1"
+ ValueChanged="_ScrollbarChangeHandler"
+ ViewportSize="10" />
CurrentFontInfo="_FontInfoHandler" />
-
+
-
-
+
+
diff --git a/src/cascadia/TerminalSettingsEditor/Actions.xaml b/src/cascadia/TerminalSettingsEditor/Actions.xaml
index d41572497..9b9ce645c 100644
--- a/src/cascadia/TerminalSettingsEditor/Actions.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Actions.xaml
@@ -1,151 +1,188 @@
-
-
+
+
-
+
-
+
-
-
+ -->
+
-
+
+ AutomationProperties.AcceleratorKey="{x:Bind KeyChordText, Mode=OneWay}"
+ AutomationProperties.Name="{x:Bind Name, Mode=OneWay}">
-
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+ Text="{x:Bind Name, Mode=OneWay}" />
-
+
+ VerticalAlignment="Center"
+ Style="{ThemeResource KeyChordBorderStyle}"
+ Visibility="{x:Bind KeyChordText, Mode=OneWay, Converter={StaticResource CommandKeyChordVisibilityConverter}}">
-
-
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
@@ -157,30 +194,34 @@ the MIT License. See LICENSE in the project root for license information. -->
+ Style="{StaticResource DisclaimerStyle}" />
-
+
-
+
-
-
+
+
-
+ SelectionMode="None" />
diff --git a/src/cascadia/TerminalSettingsEditor/ColorSchemes.xaml b/src/cascadia/TerminalSettingsEditor/ColorSchemes.xaml
index df2919047..fa43ef5c7 100644
--- a/src/cascadia/TerminalSettingsEditor/ColorSchemes.xaml
+++ b/src/cascadia/TerminalSettingsEditor/ColorSchemes.xaml
@@ -1,140 +1,135 @@
-
-
+
+
-
+
-
-
-
-
-
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
+
-
-
-
+
+
+ IsEnabled="{x:Bind CanDeleteCurrentScheme, Mode=OneWay}"
+ Style="{StaticResource SmallButtonStyle}">
-
+
@@ -142,152 +137,152 @@ the MIT License. See LICENSE in the project root for license information. -->
-
+
+ x:Uid="ColorScheme_RenameErrorTip" />
-
+
+ PreviewKeyDown="NameBox_PreviewKeyDown"
+ Style="{StaticResource TextBoxSettingStyle}" />
-
-
+
+
-
+
-
-
+
+
-
+
-
+
-
+
+ Style="{StaticResource IconButtonTextBlockStyle}" />
-
+
+ Style="{StaticResource GroupHeaderStyle}" />
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
+
+ Style="{StaticResource GroupHeaderStyle}" />
-
-
+
+
-
-
-
-
+
+
+
+
-
+
+ Grid.Column="0"
+ Style="{StaticResource ColorLabelStyle}" />
+ Grid.Column="1"
+ Content="{x:Bind CurrentForegroundColor, Mode=TwoWay}"
+ ContentTemplate="{StaticResource ColorTableEntryTemplate}"
+ Style="{StaticResource ColorControlStyle}" />
-
+
+ Grid.Column="0"
+ Style="{StaticResource ColorLabelStyle}" />
+ Grid.Column="1"
+ Content="{x:Bind CurrentBackgroundColor, Mode=TwoWay}"
+ ContentTemplate="{StaticResource ColorTableEntryTemplate}"
+ Style="{StaticResource ColorControlStyle}" />
-
+
+ Grid.Column="0"
+ Style="{StaticResource ColorLabelStyle}" />
-
-
-
-
+
+
+
+
+ Grid.Column="1"
+ Content="{x:Bind CurrentSelectionBackgroundColor, Mode=TwoWay}"
+ ContentTemplate="{StaticResource ColorTableEntryTemplate}"
+ Style="{StaticResource ColorControlStyle}" />
-
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
+ Style="{StaticResource IconButtonTextBlockStyle}" />
-
+ Style="{StaticResource CustomFlyoutTextStyle}" />
+
+ VerticalAlignment="Center"
+ Style="{StaticResource DisclaimerStyle}" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/cascadia/TerminalSettingsEditor/CommonResources.xaml b/src/cascadia/TerminalSettingsEditor/CommonResources.xaml
index fed8e8308..741c2d4a6 100644
--- a/src/cascadia/TerminalSettingsEditor/CommonResources.xaml
+++ b/src/cascadia/TerminalSettingsEditor/CommonResources.xaml
@@ -1,13 +1,14 @@
-
-
+
+
-
+
-
+
14.0
@@ -15,99 +16,127 @@ the MIT License. See LICENSE in the project root for license information. -->
0,24,0,0
250
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/cascadia/TerminalSettingsEditor/GlobalAppearance.xaml b/src/cascadia/TerminalSettingsEditor/GlobalAppearance.xaml
index 467fe60fa..84c1408ae 100644
--- a/src/cascadia/TerminalSettingsEditor/GlobalAppearance.xaml
+++ b/src/cascadia/TerminalSettingsEditor/GlobalAppearance.xaml
@@ -1,70 +1,72 @@
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
+
-
+ SelectedItem="{x:Bind CurrentTheme, Mode=TwoWay}" />
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+ SelectedItem="{x:Bind CurrentTabWidthMode, Mode=TwoWay}" />
-
-
+
+
-
+
diff --git a/src/cascadia/TerminalSettingsEditor/Interaction.xaml b/src/cascadia/TerminalSettingsEditor/Interaction.xaml
index 701e12a1d..dcff3f70e 100644
--- a/src/cascadia/TerminalSettingsEditor/Interaction.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Interaction.xaml
@@ -1,63 +1,65 @@
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+ Margin="0">
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+ SelectedItem="{x:Bind CurrentTabSwitcherMode, Mode=TwoWay}" />
-
+
-
+
diff --git a/src/cascadia/TerminalSettingsEditor/Launch.xaml b/src/cascadia/TerminalSettingsEditor/Launch.xaml
index eed1b6039..c75f4d788 100644
--- a/src/cascadia/TerminalSettingsEditor/Launch.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Launch.xaml
@@ -1,30 +1,34 @@
-
-
+
+
-
+
-
-
+
+
-
-
@@ -32,7 +36,7 @@ the MIT License. See LICENSE in the project root for license information. -->
-
+
Style="{StaticResource ComboBoxSettingStyle}">
-
+
-
-
-
-
+
+
+
+
-
+
+ Text="{x:Bind Name}" />
@@ -67,52 +69,51 @@ the MIT License. See LICENSE in the project root for license information. -->
-
+
-
+ Style="{StaticResource ComboBoxSettingStyle}" />
-
+
-
+
-
+
-
+ SelectedItem="{x:Bind CurrentLaunchMode, Mode=TwoWay}" />
-
+
-
+ SelectedItem="{x:Bind CurrentWindowingBehavior, Mode=TwoWay}" />
-
+
-
+
+ Style="{StaticResource SubtitleTextBlockStyle}" />
-
+
-
+
-
+
-
+
diff --git a/src/cascadia/TerminalSettingsEditor/MainPage.xaml b/src/cascadia/TerminalSettingsEditor/MainPage.xaml
index 92b824c70..9f0fcab6f 100644
--- a/src/cascadia/TerminalSettingsEditor/MainPage.xaml
+++ b/src/cascadia/TerminalSettingsEditor/MainPage.xaml
@@ -1,41 +1,42 @@
-
-
+
+
-
+
+ TintOpacity="0.5" />
+ TintOpacity="0.5" />
+ TintOpacity="0.7" />
@@ -43,98 +44,102 @@ the MIT License. See LICENSE in the project root for license information. -->
-
+
-
+
-
+
-
+
+ Tag="Rendering_Nav">
-
+
+ Tag="Actions_Nav">
-
+
-
+
-
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
+
-
-
-
+
+
+
+ Click="SaveButton_Click"
+ Style="{StaticResource AccentButtonStyle}" />
diff --git a/src/cascadia/TerminalSettingsEditor/Profiles.xaml b/src/cascadia/TerminalSettingsEditor/Profiles.xaml
index 318fcff5a..16b539617 100644
--- a/src/cascadia/TerminalSettingsEditor/Profiles.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Profiles.xaml
@@ -1,152 +1,159 @@
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
+
-
-
+
+
+ Visibility="{x:Bind State.Profile.IsBaseLayer}" />
-
+ Margin="1,0,0,0"
+ HorizontalAlignment="Left"
+ SelectionChanged="Pivot_SelectionChanged">
+
-
-
+
+
-
+ Margin="0,0,0,24"
+ Visibility="{x:Bind State.Profile.IsBaseLayer, Mode=OneWay, Converter={StaticResource InvertedBooleanToVisibilityConverter}}">
+
-
-
+
+ Visibility="{x:Bind State.Profile.IsBaseLayer, Mode=OneWay, Converter={StaticResource InvertedBooleanToVisibilityConverter}}">
-
+
+ Style="{StaticResource BrowseButtonStyle}" />
-
-
+
+ HasSettingValue="{x:Bind State.Profile.HasStartingDirectory, Mode=OneWay}"
+ SettingOverrideSource="{x:Bind State.Profile.StartingDirectoryOverrideSource, Mode=OneWay}">
-
-
+
+ Style="{StaticResource BrowseButtonStyle}" />
-
+
-
+
-
+
+ Style="{StaticResource BrowseButtonStyle}" />
-
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
+ Margin="10,0,0,0" />
+ Style="{StaticResource CustomFlyoutTextStyle}" />
+ Click="DeleteConfirmation_Click" />
+ VerticalAlignment="Center"
+ Style="{StaticResource DisclaimerStyle}" />
-
+
-
-
+
+
-
+
+ HasSettingValue="{x:Bind State.Profile.HasColorSchemeName, Mode=OneWay}"
+ SettingOverrideSource="{x:Bind State.Profile.ColorSchemeNameOverrideSource, Mode=OneWay}">
-
+
-
+
-
-
+
-
+
-
+
+ IsEnabled="{x:Bind State.Profile.UsingMonospaceFont, Mode=OneWay}" />
-
+
-
+ Style="{StaticResource NumberBoxSettingStyle}"
+ Value="{x:Bind State.Profile.FontSize, Mode=TwoWay}" />
-
-
+
+ Style="{StaticResource ComboBoxSettingStyle}" />
-
+
+ Style="{StaticResource CustomSliderControlGridStyle}"
+ Visibility="{x:Bind IsCustomFontWeight, Mode=OneWay}">
-
-
+
+
+ Maximum="1000"
+ Minimum="0"
+ TickFrequency="50"
+ TickPlacement="Outside"
+ Value="{x:Bind State.Profile.FontWeight, Converter={StaticResource FontWeightConverter}, Mode=TwoWay}" />
+ Text="{Binding ElementName=FontWeightSlider, Path=Value, Mode=OneWay}" />
-
+
-
+
-
+
-
+
-
+
-
+ HasSettingValue="{x:Bind State.Profile.HasCursorShape, Mode=OneWay}"
+ SettingOverrideSource="{x:Bind State.Profile.CursorShapeOverrideSource, Mode=OneWay}">
+
-
+
-
-
+
+
+ Minimum="1"
+ Value="{x:Bind State.Profile.CursorHeight, Mode=TwoWay}" />
+ Style="{StaticResource SliderValueLabelStyle}"
+ Text="{Binding ElementName=CursorHeightSlider, Path=Value, Mode=OneWay}" />
-
+
-
+
-
-
+
+ HasSettingValue="{x:Bind State.Profile.HasBackgroundImagePath, Mode=OneWay}"
+ SettingOverrideSource="{x:Bind State.Profile.BackgroundImagePathOverrideSource, Mode=OneWay}">
-
+
+ Style="{StaticResource BrowseButtonStyle}" />
-
+
-
+
-
+
-
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
-
+
17
-
+
-
+
-
-
+
16
-
+
-
+
-
-
+
18
-
+
-
+
-
-
+
-
+
1
-
+
-
-
+
0
-
+
-
-
+
2
-
+
-
-
+
-
+
33
-
+
-
-
+
32
-
+
-
-
+
34
-
+
-
-
+
-
-
+
+
+ Value="{x:Bind State.Profile.BackgroundImageOpacity, Converter={StaticResource PercentageConverter}, Mode=TwoWay}" />
+ Style="{StaticResource SliderValueLabelStyle}"
+ Text="{Binding ElementName=BIOpacitySlider, Path=Value, Mode=OneWay}" />
-
+
-
+
-
+
+ HasSettingValue="{x:Bind State.Profile.HasUseAcrylic, Mode=OneWay}"
+ SettingOverrideSource="{x:Bind State.Profile.UseAcrylicOverrideSource, Mode=OneWay}">
+ IsOn="{x:Bind State.Profile.UseAcrylic, Mode=TwoWay}" />
-
-
+
-
-
+
+
+ Value="{x:Bind State.Profile.AcrylicOpacity, Converter={StaticResource PercentageConverter}, Mode=TwoWay}" />
+ Style="{StaticResource SliderValueLabelStyle}"
+ Text="{Binding ElementName=AcrylicOpacitySlider, Path=Value, Mode=OneWay}" />
-
+
-
+
-
+
+ HasSettingValue="{x:Bind State.Profile.HasPadding, Mode=OneWay}"
+ SettingOverrideSource="{x:Bind State.Profile.PaddingOverrideSource, Mode=OneWay}">
-
-
+
+
+ Value="{x:Bind State.Profile.Padding, Converter={StaticResource PaddingConverter}, Mode=TwoWay}" />
+ Style="{StaticResource SliderValueLabelStyle}"
+ Text="{Binding ElementName=PaddingSlider, Path=Value, Mode=OneWay}" />
-
+
-
+
-
+
-
+
-
+ HasSettingValue="{x:Bind State.Profile.HasSuppressApplicationTitle, Mode=OneWay}"
+ SettingOverrideSource="{x:Bind State.Profile.SuppressApplicationTitleOverrideSource, Mode=OneWay}">
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+ Style="{StaticResource NumberBoxSettingStyle}"
+ Value="{x:Bind State.Profile.HistorySize, Mode=TwoWay}" />
-
+
-
+
-
+
-
+
diff --git a/src/cascadia/TerminalSettingsEditor/Rendering.xaml b/src/cascadia/TerminalSettingsEditor/Rendering.xaml
index cd1b4021c..cd6da7ca6 100644
--- a/src/cascadia/TerminalSettingsEditor/Rendering.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Rendering.xaml
@@ -1,35 +1,36 @@
-
-
+
+
-
+
-
+
+ Style="{StaticResource DisclaimerStyle}" />
-
+
-
+
-
+
-
+
diff --git a/src/cascadia/TerminalSettingsEditor/SettingContainerStyle.xaml b/src/cascadia/TerminalSettingsEditor/SettingContainerStyle.xaml
index ebe4bec87..717e6e808 100644
--- a/src/cascadia/TerminalSettingsEditor/SettingContainerStyle.xaml
+++ b/src/cascadia/TerminalSettingsEditor/SettingContainerStyle.xaml
@@ -1,52 +1,56 @@
-
-
+
+
-
-
-