maxmustermann/terminal
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

remove remnants of previous implementation, format

Browse source
This commit is contained in:
Pankaj Bhojwani 2021-11-09 15:10:35 -08:00
parent 13bbcbf50f
commit 81d0c5c2d7
6 changed files with 53 additions and 94 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/cascadia/TerminalSettingsEditor/Appearances.xaml
View file

@ -210,11 +210,11 @@
<!-- Background Image --> <!-- Background Image -->
<local:SettingContainer x:Name="BackgroundImageContainer" <local:SettingContainer x:Name="BackgroundImageContainer"
x:Uid="Profile_BackgroundImage" x:Uid="Profile_BackgroundImage"
Style="{StaticResource ExpanderSettingContainerStyle}"
CurrentValue="{x:Bind Appearance.BackgroundImagePath, Mode=OneWay}"
ClearSettingValue="{x:Bind Appearance.ClearBackgroundImagePath}" ClearSettingValue="{x:Bind Appearance.ClearBackgroundImagePath}"
CurrentValue="{x:Bind Appearance.BackgroundImagePath, Mode=OneWay}"
HasSettingValue="{x:Bind Appearance.HasBackgroundImagePath, Mode=OneWay}" HasSettingValue="{x:Bind Appearance.HasBackgroundImagePath, Mode=OneWay}"
SettingOverrideSource="{x:Bind Appearance.BackgroundImagePathOverrideSource, Mode=OneWay}"> SettingOverrideSource="{x:Bind Appearance.BackgroundImagePathOverrideSource, Mode=OneWay}"
Style="{StaticResource ExpanderSettingContainerStyle}">
<StackPanel Orientation="Vertical"> <StackPanel Orientation="Vertical">
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<TextBox IsEnabled="{x:Bind local:Converters.StringsAreNotEqual('desktopWallpaper', Appearance.BackgroundImagePath), Mode=OneWay}" <TextBox IsEnabled="{x:Bind local:Converters.StringsAreNotEqual('desktopWallpaper', Appearance.BackgroundImagePath), Mode=OneWay}"
@ -236,8 +236,8 @@
<local:SettingContainer x:Uid="Profile_BackgroundImageStretchMode" <local:SettingContainer x:Uid="Profile_BackgroundImageStretchMode"
ClearSettingValue="{x:Bind Appearance.ClearBackgroundImageStretchMode}" ClearSettingValue="{x:Bind Appearance.ClearBackgroundImageStretchMode}"
HasSettingValue="{x:Bind Appearance.HasBackgroundImageStretchMode, Mode=OneWay}" HasSettingValue="{x:Bind Appearance.HasBackgroundImageStretchMode, Mode=OneWay}"
Style="{StaticResource ExpanderSettingContainerStyle}"
SettingOverrideSource="{x:Bind Appearance.BackgroundImageStretchModeOverrideSource, Mode=OneWay}" SettingOverrideSource="{x:Bind Appearance.BackgroundImageStretchModeOverrideSource, Mode=OneWay}"
Style="{StaticResource ExpanderSettingContainerStyle}"
Visibility="{x:Bind Appearance.BackgroundImageSettingsVisible, Mode=OneWay}"> Visibility="{x:Bind Appearance.BackgroundImageSettingsVisible, Mode=OneWay}">
<muxc:RadioButtons AutomationProperties.AccessibilityView="Content" <muxc:RadioButtons AutomationProperties.AccessibilityView="Content"
ItemTemplate="{StaticResource EnumRadioButtonTemplate}" ItemTemplate="{StaticResource EnumRadioButtonTemplate}"
@ -248,9 +248,9 @@
<!-- Background Image Alignment --> <!-- Background Image Alignment -->
<local:SettingContainer x:Uid="Profile_BackgroundImageAlignment" <local:SettingContainer x:Uid="Profile_BackgroundImageAlignment"
ClearSettingValue="{x:Bind Appearance.ClearBackgroundImageAlignment}" ClearSettingValue="{x:Bind Appearance.ClearBackgroundImageAlignment}"
Style="{StaticResource ExpanderSettingContainerStyle}"
HasSettingValue="{x:Bind Appearance.HasBackgroundImageAlignment, Mode=OneWay}" HasSettingValue="{x:Bind Appearance.HasBackgroundImageAlignment, Mode=OneWay}"
SettingOverrideSource="{x:Bind Appearance.BackgroundImageAlignmentOverrideSource, Mode=OneWay}" SettingOverrideSource="{x:Bind Appearance.BackgroundImageAlignmentOverrideSource, Mode=OneWay}"
Style="{StaticResource ExpanderSettingContainerStyle}"
Visibility="{x:Bind Appearance.BackgroundImageSettingsVisible, Mode=OneWay}"> Visibility="{x:Bind Appearance.BackgroundImageSettingsVisible, Mode=OneWay}">
<Grid HorizontalAlignment="Left"> <Grid HorizontalAlignment="Left">
<Grid.RowDefinitions> <Grid.RowDefinitions>

2
src/cascadia/TerminalSettingsEditor/CommonResources.xaml
View file

@ -36,7 +36,7 @@
<Style x:Key="PivotStackStyle" <Style x:Key="PivotStackStyle"
TargetType="StackPanel"> TargetType="StackPanel">
<Setter Property="HorizontalAlignment" Value="Stretch" /> <Setter Property="HorizontalAlignment" Value="Stretch" />
<Setter Property="Margin" Value="13,0,0,48" /> <Setter Property="Margin" Value="0,0,0,48" />
</Style> </Style>
<!-- Combo Box --> <!-- Combo Box -->

4
src/cascadia/TerminalSettingsEditor/Interaction.xaml
View file

@ -52,8 +52,8 @@
<!-- Word Delimiters --> <!-- Word Delimiters -->
<local:SettingContainer x:Uid="Globals_WordDelimiters" <local:SettingContainer x:Uid="Globals_WordDelimiters"
Style="{StaticResource ExpanderSettingContainerStyle}" CurrentValue="{x:Bind State.Globals.WordDelimiters, Mode=OneWay}"
CurrentValue="{x:Bind State.Globals.WordDelimiters, Mode=OneWay}"> Style="{StaticResource ExpanderSettingContainerStyle}">
<TextBox IsSpellCheckEnabled="False" <TextBox IsSpellCheckEnabled="False"
Style="{StaticResource TextBoxSettingStyle}" Style="{StaticResource TextBoxSettingStyle}"
Text="{x:Bind State.Globals.WordDelimiters, Mode=TwoWay}" /> Text="{x:Bind State.Globals.WordDelimiters, Mode=TwoWay}" />

4
src/cascadia/TerminalSettingsEditor/Launch.xaml
View file

@ -134,8 +134,8 @@
<!-- First Window Behavior --> <!-- First Window Behavior -->
<local:SettingContainer x:Uid="Globals_FirstWindowPreference" <local:SettingContainer x:Uid="Globals_FirstWindowPreference"
Visibility="{x:Bind ShowFirstWindowPreference}" Style="{StaticResource ExpanderSettingContainerStyle}"
Style="{StaticResource ExpanderSettingContainerStyle}"> Visibility="{x:Bind ShowFirstWindowPreference}">
<muxc:RadioButtons AutomationProperties.AccessibilityView="Content" <muxc:RadioButtons AutomationProperties.AccessibilityView="Content"
ItemTemplate="{StaticResource EnumRadioButtonTemplate}" ItemTemplate="{StaticResource EnumRadioButtonTemplate}"
ItemsSource="{x:Bind FirstWindowPreferenceList}" ItemsSource="{x:Bind FirstWindowPreferenceList}"

20
src/cascadia/TerminalSettingsEditor/Profiles.xaml
View file

@ -66,8 +66,8 @@
so the name will always be overridden. so the name will always be overridden.
--> -->
<local:SettingContainer x:Uid="Profile_Name" <local:SettingContainer x:Uid="Profile_Name"
Style="{StaticResource ExpanderSettingContainerStyle}"
CurrentValue="{x:Bind State.Profile.Name, Mode=OneWay}" CurrentValue="{x:Bind State.Profile.Name, Mode=OneWay}"
Style="{StaticResource ExpanderSettingContainerStyle}"
Visibility="{x:Bind local:Converters.InvertedBooleanToVisibility(State.Profile.IsBaseLayer), Mode=OneWay}"> Visibility="{x:Bind local:Converters.InvertedBooleanToVisibility(State.Profile.IsBaseLayer), Mode=OneWay}">
<TextBox Style="{StaticResource TextBoxSettingStyle}" <TextBox Style="{StaticResource TextBoxSettingStyle}"
Text="{x:Bind State.Profile.Name, Mode=TwoWay}" /> Text="{x:Bind State.Profile.Name, Mode=TwoWay}" />
@ -77,10 +77,10 @@
<local:SettingContainer x:Name="CommandlineContainer" <local:SettingContainer x:Name="CommandlineContainer"
x:Uid="Profile_Commandline" x:Uid="Profile_Commandline"
ClearSettingValue="{x:Bind State.Profile.ClearCommandline}" ClearSettingValue="{x:Bind State.Profile.ClearCommandline}"
CurrentValue="{x:Bind State.Profile.Commandline, Mode=OneWay}"
HasSettingValue="{x:Bind State.Profile.HasCommandline, Mode=OneWay}" HasSettingValue="{x:Bind State.Profile.HasCommandline, Mode=OneWay}"
SettingOverrideSource="{x:Bind State.Profile.CommandlineOverrideSource, Mode=OneWay}" SettingOverrideSource="{x:Bind State.Profile.CommandlineOverrideSource, Mode=OneWay}"
Style="{StaticResource ExpanderSettingContainerStyle}" Style="{StaticResource ExpanderSettingContainerStyle}"
CurrentValue="{x:Bind State.Profile.Commandline, Mode=OneWay}"
Visibility="{x:Bind local:Converters.InvertedBooleanToVisibility(State.Profile.IsBaseLayer), Mode=OneWay}"> Visibility="{x:Bind local:Converters.InvertedBooleanToVisibility(State.Profile.IsBaseLayer), Mode=OneWay}">
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<TextBox x:Uid="Profile_CommandlineBox" <TextBox x:Uid="Profile_CommandlineBox"
@ -96,11 +96,11 @@
<!-- Starting Directory --> <!-- Starting Directory -->
<local:SettingContainer x:Name="StartingDirectoryContainer" <local:SettingContainer x:Name="StartingDirectoryContainer"
x:Uid="Profile_StartingDirectory" x:Uid="Profile_StartingDirectory"
Style="{StaticResource ExpanderSettingContainerStyle}"
CurrentValue="{x:Bind State.Profile.StartingDirectory, Mode=OneWay}"
ClearSettingValue="{x:Bind State.Profile.ClearStartingDirectory}" ClearSettingValue="{x:Bind State.Profile.ClearStartingDirectory}"
CurrentValue="{x:Bind State.Profile.StartingDirectory, Mode=OneWay}"
HasSettingValue="{x:Bind State.Profile.HasStartingDirectory, Mode=OneWay}" HasSettingValue="{x:Bind State.Profile.HasStartingDirectory, Mode=OneWay}"
SettingOverrideSource="{x:Bind State.Profile.StartingDirectoryOverrideSource, Mode=OneWay}"> SettingOverrideSource="{x:Bind State.Profile.StartingDirectoryOverrideSource, Mode=OneWay}"
Style="{StaticResource ExpanderSettingContainerStyle}">
<StackPanel Orientation="Vertical"> <StackPanel Orientation="Vertical">
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<TextBox x:Uid="Profile_StartingDirectoryBox" <TextBox x:Uid="Profile_StartingDirectoryBox"
@ -123,10 +123,10 @@
<!-- Icon --> <!-- Icon -->
<local:SettingContainer x:Uid="Profile_Icon" <local:SettingContainer x:Uid="Profile_Icon"
ClearSettingValue="{x:Bind State.Profile.ClearIcon}" ClearSettingValue="{x:Bind State.Profile.ClearIcon}"
HasSettingValue="{x:Bind State.Profile.HasIcon, Mode=OneWay}"
Style="{StaticResource ExpanderSettingContainerStyle}"
CurrentValue="{x:Bind State.Profile.Icon, Mode=OneWay}" CurrentValue="{x:Bind State.Profile.Icon, Mode=OneWay}"
SettingOverrideSource="{x:Bind State.Profile.IconOverrideSource, Mode=OneWay}"> HasSettingValue="{x:Bind State.Profile.HasIcon, Mode=OneWay}"
SettingOverrideSource="{x:Bind State.Profile.IconOverrideSource, Mode=OneWay}"
Style="{StaticResource ExpanderSettingContainerStyle}">
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<TextBox x:Uid="Profile_IconBox" <TextBox x:Uid="Profile_IconBox"
FontFamily="Segoe UI, Segoe MDL2 Assets" FontFamily="Segoe UI, Segoe MDL2 Assets"
@ -142,10 +142,10 @@
<!-- Tab Title --> <!-- Tab Title -->
<local:SettingContainer x:Uid="Profile_TabTitle" <local:SettingContainer x:Uid="Profile_TabTitle"
ClearSettingValue="{x:Bind State.Profile.ClearTabTitle}" ClearSettingValue="{x:Bind State.Profile.ClearTabTitle}"
Style="{StaticResource ExpanderSettingContainerStyle}"
CurrentValue="{x:Bind State.Profile.TabTitle, Mode=OneWay}" CurrentValue="{x:Bind State.Profile.TabTitle, Mode=OneWay}"
HasSettingValue="{x:Bind State.Profile.HasTabTitle, Mode=OneWay}" HasSettingValue="{x:Bind State.Profile.HasTabTitle, Mode=OneWay}"
SettingOverrideSource="{x:Bind State.Profile.TabTitleOverrideSource, Mode=OneWay}"> SettingOverrideSource="{x:Bind State.Profile.TabTitleOverrideSource, Mode=OneWay}"
Style="{StaticResource ExpanderSettingContainerStyle}">
<TextBox Style="{StaticResource TextBoxSettingStyle}" <TextBox Style="{StaticResource TextBoxSettingStyle}"
Text="{x:Bind State.Profile.TabTitle, Mode=TwoWay}" /> Text="{x:Bind State.Profile.TabTitle, Mode=TwoWay}" />
</local:SettingContainer> </local:SettingContainer>

107
src/cascadia/TerminalSettingsEditor/SettingContainerStyle.xaml
View file

@ -12,63 +12,27 @@
<ResourceDictionary.ThemeDictionaries> <ResourceDictionary.ThemeDictionaries>
<ResourceDictionary x:Key="Light"> <ResourceDictionary x:Key="Light">
<StaticResource x:Key="ExpanderBorderBrushExpandedPointerOver"
ResourceKey="SystemControlForegroundTransparentBrush" />
<StaticResource x:Key="ExpanderTextColorExpandedPointerOver"
ResourceKey="SystemControlForegroundBaseHighBrush" />
<Style x:Key="SecondaryTextBlockStyle" <Style x:Key="SecondaryTextBlockStyle"
TargetType="TextBlock"> TargetType="TextBlock">
<Setter Property="Foreground" Value="{ThemeResource SystemBaseMediumColor}" /> <Setter Property="Foreground" Value="{ThemeResource SystemBaseMediumColor}" />
</Style> </Style>
<Color x:Key="CardBackgroundFillColorDefault">#B3FFFFFF</Color> <SolidColorBrush x:Key="SubgroupHeaderBrush"
<Color x:Key="CardStrokeColorDefault">#0F000000</Color> Color="{StaticResource SystemBaseMediumColor}" />
<SolidColorBrush x:Key="CardBackgroundFillColorDefaultBrush" Color="{StaticResource CardBackgroundFillColorDefault}" />
<SolidColorBrush x:Key="CardStrokeColorDefaultBrush" Color="{StaticResource CardStrokeColorDefault}" />
<SolidColorBrush x:Key="SubgroupHeaderBrush" Color="{StaticResource SystemBaseMediumColor}" />
<StaticResource x:Key="ExpanderHeaderBackground" ResourceKey="CardBackgroundFillColorDefaultBrush" />
<StaticResource x:Key="ExpanderHeaderBorderBrush" ResourceKey="CardStrokeColorDefaultBrush" />
<x:Double x:Key="FlyoutThemeMinWidth">96</x:Double>
<Thickness x:Key="ExpanderHeaderBorderThickness">1</Thickness>
<CornerRadius x:Key="ControlCornerRadius">4</CornerRadius>
</ResourceDictionary> </ResourceDictionary>
<ResourceDictionary x:Key="HighContrast"> <ResourceDictionary x:Key="HighContrast">
<StaticResource x:Key="ExpanderBorderBrushExpandedPointerOver"
ResourceKey="SystemControlHighlightBaseHighBrush" />
<StaticResource x:Key="ExpanderTextColorExpandedPointerOver"
ResourceKey="SystemColorHighlightTextColor" />
<Style x:Key="SecondaryTextBlockStyle" <Style x:Key="SecondaryTextBlockStyle"
TargetType="TextBlock" /> TargetType="TextBlock" />
<!-- Do not mess with the foreground color for High Contrast. Let it ride as is. --> <!-- Do not mess with the foreground color for High Contrast. Let it ride as is. -->
<Color x:Key="CardBackgroundFillColorDefault">#FF0000</Color> <SolidColorBrush x:Key="SubgroupHeaderBrush"
<Color x:Key="CardStrokeColorDefault">#FF0000</Color> Color="{ThemeResource SystemColorWindowTextColor}" />
<StaticResource x:Key="CardBackgroundFillColorDefaultBrush" ResourceKey="SystemColorButtonFaceColorBrush" />
<StaticResource x:Key="CardStrokeColorDefaultBrush" ResourceKey="SystemColorButtonTextColorBrush" />
<StaticResource x:Key="ExpanderHeaderBackground" ResourceKey="SystemColorButtonFaceColorBrush" />
<StaticResource x:Key="ExpanderHeaderBorderBrush" ResourceKey="SystemColorButtonTextColorBrush" />
<SolidColorBrush x:Key="SubgroupHeaderBrush" Color="{ThemeResource SystemColorWindowTextColor}" />
<x:Double x:Key="FlyoutThemeMinWidth">96</x:Double>
<Thickness x:Key="ExpanderHeaderBorderThickness">2</Thickness>
<CornerRadius x:Key="ControlCornerRadius">4</CornerRadius>
</ResourceDictionary> </ResourceDictionary>
<ResourceDictionary x:Key="Dark"> <ResourceDictionary x:Key="Dark">
<StaticResource x:Key="ExpanderBorderBrushExpandedPointerOver"
ResourceKey="SystemControlForegroundTransparentBrush" />
<StaticResource x:Key="ExpanderTextColorExpandedPointerOver"
ResourceKey="SystemControlForegroundBaseHighBrush" />
<Style x:Key="SecondaryTextBlockStyle" <Style x:Key="SecondaryTextBlockStyle"
TargetType="TextBlock"> TargetType="TextBlock">
<Setter Property="Foreground" Value="{ThemeResource SystemBaseMediumColor}" /> <Setter Property="Foreground" Value="{ThemeResource SystemBaseMediumColor}" />
</Style> </Style>
<Color x:Key="CardBackgroundFillColorDefault">#0DFFFFFF</Color> <SolidColorBrush x:Key="SubgroupHeaderBrush"
<Color x:Key="CardStrokeColorDefault">#19000000</Color> Color="{StaticResource SystemBaseMediumColor}" />
<SolidColorBrush x:Key="CardBackgroundFillColorDefaultBrush" Color="{StaticResource CardBackgroundFillColorDefault}" />
<SolidColorBrush x:Key="CardStrokeColorDefaultBrush" Color="{StaticResource CardStrokeColorDefault}" />
<SolidColorBrush x:Key="SubgroupHeaderBrush" Color="{StaticResource SystemBaseMediumColor}" />
<StaticResource x:Key="ExpanderHeaderBackground" ResourceKey="CardBackgroundFillColorDefaultBrush" />
<StaticResource x:Key="ExpanderHeaderBorderBrush" ResourceKey="CardStrokeColorDefaultBrush" />
<x:Double x:Key="FlyoutThemeMinWidth">96</x:Double>
<Thickness x:Key="ExpanderHeaderBorderThickness">1</Thickness>
<CornerRadius x:Key="ControlCornerRadius">4</CornerRadius>
</ResourceDictionary> </ResourceDictionary>
</ResourceDictionary.ThemeDictionaries> </ResourceDictionary.ThemeDictionaries>
@ -94,7 +58,8 @@
<Setter Property="FontFamily" Value="Segoe MDL2 Assets" /> <Setter Property="FontFamily" Value="Segoe MDL2 Assets" />
</Style> </Style>
<Style x:Key="NonExpanderGrid" TargetType="Grid"> <Style x:Key="NonExpanderGrid"
TargetType="Grid">
<Setter Property="Background" Value="{ThemeResource ExpanderHeaderBackground}" /> <Setter Property="Background" Value="{ThemeResource ExpanderHeaderBackground}" />
<Setter Property="MinWidth" Value="{ThemeResource FlyoutThemeMinWidth}" /> <Setter Property="MinWidth" Value="{ThemeResource FlyoutThemeMinWidth}" />
<Setter Property="MinHeight" Value="64" /> <Setter Property="MinHeight" Value="64" />
@ -107,19 +72,17 @@
<Setter Property="VerticalAlignment" Value="Stretch" /> <Setter Property="VerticalAlignment" Value="Stretch" />
</Style> </Style>
<Style <Style x:Key="SettingsPageItemHeaderStyle"
x:Key="SettingsPageItemHeaderStyle" BasedOn="{StaticResource BodyTextBlockStyle}"
BasedOn="{StaticResource BodyTextBlockStyle}" TargetType="TextBlock">
TargetType="TextBlock">
<Setter Property="Margin" Value="0,12,0,0" /> <Setter Property="Margin" Value="0,12,0,0" />
<Setter Property="LineHeight" Value="20" /> <Setter Property="LineHeight" Value="20" />
<Setter Property="TextWrapping" Value="WrapWholeWords" /> <Setter Property="TextWrapping" Value="WrapWholeWords" />
</Style> </Style>
<Style <Style x:Key="SettingsPageItemDescriptionStyle"
x:Key="SettingsPageItemDescriptionStyle" BasedOn="{StaticResource CaptionTextBlockStyle}"
BasedOn="{StaticResource CaptionTextBlockStyle}" TargetType="TextBlock">
TargetType="TextBlock">
<Setter Property="Margin" Value="0,0,24,12" /> <Setter Property="Margin" Value="0,0,24,12" />
<Setter Property="LineHeight" Value="16" /> <Setter Property="LineHeight" Value="16" />
<Setter Property="Foreground" Value="{ThemeResource SubgroupHeaderBrush}" /> <Setter Property="Foreground" Value="{ThemeResource SubgroupHeaderBrush}" />
@ -133,26 +96,23 @@
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType="local:SettingContainer"> <ControlTemplate TargetType="local:SettingContainer">
<StackPanel> <StackPanel>
<Grid Style="{StaticResource NonExpanderGrid}" <Grid Style="{StaticResource NonExpanderGrid}">
x:Name="ayy">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="*" /> <ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" /> <ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<StackPanel> <StackPanel>
<TextBlock <TextBlock Style="{StaticResource SettingsPageItemHeaderStyle}"
Text="{TemplateBinding Header}" Text="{TemplateBinding Header}" />
Style="{StaticResource SettingsPageItemHeaderStyle}" />
<TextBlock Style="{StaticResource SettingsPageItemDescriptionStyle}" <TextBlock Style="{StaticResource SettingsPageItemDescriptionStyle}"
Text="{TemplateBinding HelpText}"/> Text="{TemplateBinding HelpText}" />
</StackPanel> </StackPanel>
<ContentPresenter <ContentPresenter Grid.Column="1"
Grid.Column="1" MinWidth="0"
MinWidth="0" HorizontalAlignment="Right"
HighContrastAdjustment="None" VerticalAlignment="Center"
HorizontalAlignment="Right" Content="{TemplateBinding Content}"
VerticalAlignment="Center" HighContrastAdjustment="None" />
Content="{TemplateBinding Content}" />
</Grid> </Grid>
</StackPanel> </StackPanel>
</ControlTemplate> </ControlTemplate>
@ -160,8 +120,8 @@
</Setter> </Setter>
</Style> </Style>
<Style TargetType="local:SettingContainer" <Style x:Key="ExpanderSettingContainerStyle"
x:Key="ExpanderSettingContainerStyle"> TargetType="local:SettingContainer">
<Setter Property="Template"> <Setter Property="Template">
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType="local:SettingContainer"> <ControlTemplate TargetType="local:SettingContainer">
@ -175,22 +135,21 @@
<ColumnDefinition Width="Auto" /> <ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<StackPanel> <StackPanel>
<TextBlock <TextBlock Style="{StaticResource SettingsPageItemHeaderStyle}"
Text="{TemplateBinding Header}" Text="{TemplateBinding Header}" />
Style="{StaticResource SettingsPageItemHeaderStyle}" /> <TextBlock Style="{StaticResource SettingsPageItemDescriptionStyle}"
<TextBlock Text="{TemplateBinding HelpText}" Text="{TemplateBinding HelpText}" />
Style="{StaticResource SettingsPageItemDescriptionStyle}" />
</StackPanel> </StackPanel>
<TextBlock Grid.Column="1" <TextBlock Grid.Column="1"
HorizontalAlignment="Right"
Margin="0,0,-16,0" Margin="0,0,-16,0"
HorizontalAlignment="Right"
VerticalAlignment="Center" VerticalAlignment="Center"
Style="{StaticResource SettingsPageItemDescriptionStyle}" Style="{StaticResource SettingsPageItemDescriptionStyle}"
Text="{TemplateBinding CurrentValue}"/> Text="{TemplateBinding CurrentValue}" />
</Grid> </Grid>
</muxc:Expander.Header> </muxc:Expander.Header>
<muxc:Expander.Content> <muxc:Expander.Content>
<ContentPresenter Content="{TemplateBinding Content}"/> <ContentPresenter Content="{TemplateBinding Content}" />
</muxc:Expander.Content> </muxc:Expander.Content>
</muxc:Expander> </muxc:Expander>
</ControlTemplate> </ControlTemplate>