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

carlos comments

Browse source
This commit is contained in:
Pankaj Bhojwani 2021-11-10 13:50:41 -08:00
parent 81d0c5c2d7
commit 61ae0a1a77
2 changed files with 18 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -28,14 +28,12 @@
<!-- Used to stack a group of settings --> <!-- Used to stack a group of settings -->
<Style x:Key="SettingsStackStyle" <Style x:Key="SettingsStackStyle"
TargetType="StackPanel"> TargetType="StackPanel">
<Setter Property="HorizontalAlignment" Value="Stretch" />
<Setter Property="Margin" Value="13,0,0,48" /> <Setter Property="Margin" Value="13,0,0,48" />
</Style> </Style>
<!-- Used to stack a group of settings inside a pivot --> <!-- Used to stack a group of settings inside a pivot -->
<Style x:Key="PivotStackStyle" <Style x:Key="PivotStackStyle"
TargetType="StackPanel"> TargetType="StackPanel">
<Setter Property="HorizontalAlignment" Value="Stretch" />
<Setter Property="Margin" Value="0,0,0,48" /> <Setter Property="Margin" Value="0,0,0,48" />
</Style> </Style>

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

@ -67,9 +67,7 @@
<Setter Property="BorderBrush" Value="{ThemeResource ExpanderHeaderBorderBrush}" /> <Setter Property="BorderBrush" Value="{ThemeResource ExpanderHeaderBorderBrush}" />
<Setter Property="Padding" Value="16,0,8,0" /> <Setter Property="Padding" Value="16,0,8,0" />
<Setter Property="Margin" Value="0,4,0,0" /> <Setter Property="Margin" Value="0,4,0,0" />
<Setter Property="HorizontalAlignment" Value="Stretch" />
<Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" /> <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
<Setter Property="VerticalAlignment" Value="Stretch" />
</Style> </Style>
<Style x:Key="SettingsPageItemHeaderStyle" <Style x:Key="SettingsPageItemHeaderStyle"
@ -95,26 +93,22 @@
<Setter Property="Template"> <Setter Property="Template">
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType="local:SettingContainer"> <ControlTemplate TargetType="local:SettingContainer">
<StackPanel> <Grid Style="{StaticResource NonExpanderGrid}">
<Grid Style="{StaticResource NonExpanderGrid}"> <Grid.ColumnDefinitions>
<Grid.ColumnDefinitions> <ColumnDefinition Width="*" />
<ColumnDefinition Width="*" /> <ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" /> </Grid.ColumnDefinitions>
</Grid.ColumnDefinitions> <StackPanel>
<StackPanel> <TextBlock Style="{StaticResource SettingsPageItemHeaderStyle}"
<TextBlock Style="{StaticResource SettingsPageItemHeaderStyle}" Text="{TemplateBinding Header}" />
Text="{TemplateBinding Header}" /> <TextBlock Style="{StaticResource SettingsPageItemDescriptionStyle}"
<TextBlock Style="{StaticResource SettingsPageItemDescriptionStyle}" Text="{TemplateBinding HelpText}" />
Text="{TemplateBinding HelpText}" /> </StackPanel>
</StackPanel> <ContentPresenter Grid.Column="1"
<ContentPresenter Grid.Column="1" HorizontalAlignment="Right"
MinWidth="0" VerticalAlignment="Center"
HorizontalAlignment="Right" Content="{TemplateBinding Content}" />
VerticalAlignment="Center" </Grid>
Content="{TemplateBinding Content}"
HighContrastAdjustment="None" />
</Grid>
</StackPanel>
</ControlTemplate> </ControlTemplate>
</Setter.Value> </Setter.Value>
</Setter> </Setter>
@ -127,7 +121,8 @@
<ControlTemplate TargetType="local:SettingContainer"> <ControlTemplate TargetType="local:SettingContainer">
<muxc:Expander Margin="0,4,8,0" <muxc:Expander Margin="0,4,8,0"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
HorizontalContentAlignment="Stretch"> HorizontalContentAlignment="Stretch"
Content="{TemplateBinding Content}">
<muxc:Expander.Header> <muxc:Expander.Header>
<Grid MinHeight="64"> <Grid MinHeight="64">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
@ -148,9 +143,6 @@
Text="{TemplateBinding CurrentValue}" /> Text="{TemplateBinding CurrentValue}" />
</Grid> </Grid>
</muxc:Expander.Header> </muxc:Expander.Header>
<muxc:Expander.Content>
<ContentPresenter Content="{TemplateBinding Content}" />
</muxc:Expander.Content>
</muxc:Expander> </muxc:Expander>
</ControlTemplate> </ControlTemplate>
</Setter.Value> </Setter.Value>