testing
This commit is contained in:
parent
756fd444b1
commit
0b58355ef4
|
@ -21,7 +21,7 @@
|
|||
<ResourceDictionary.MergedDictionaries>
|
||||
<!-- Include the MUX Controls resources -->
|
||||
<XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls"
|
||||
ControlsResourcesVersion="Version1" />
|
||||
ControlsResourcesVersion="Version2" />
|
||||
<ResourceDictionary>
|
||||
|
||||
<!--
|
||||
|
|
|
@ -48,14 +48,14 @@
|
|||
<!-- Used to stack a group of settings -->
|
||||
<Style x:Key="SettingsStackStyle"
|
||||
TargetType="StackPanel">
|
||||
<Setter Property="HorizontalAlignment" Value="Left" />
|
||||
<Setter Property="HorizontalAlignment" Value="Stretch" />
|
||||
<Setter Property="Margin" Value="13,0,0,48" />
|
||||
</Style>
|
||||
|
||||
<!-- Used to stack a group of settings inside a pivot -->
|
||||
<Style x:Key="PivotStackStyle"
|
||||
TargetType="StackPanel">
|
||||
<Setter Property="HorizontalAlignment" Value="Left" />
|
||||
<Setter Property="HorizontalAlignment" Value="Stretch" />
|
||||
<Setter Property="Margin" Value="0,0,0,48" />
|
||||
</Style>
|
||||
|
||||
|
|
|
@ -38,19 +38,35 @@
|
|||
<Setter.Value>
|
||||
<ControlTemplate TargetType="local:SettingContainer">
|
||||
<StackPanel>
|
||||
|
||||
<!-- Header space -->
|
||||
<StackPanel Style="{StaticResource SettingContainerHeaderStyle}">
|
||||
<TextBlock Text="{TemplateBinding Header}" />
|
||||
<Button x:Name="ResetButton"
|
||||
Style="{StaticResource SettingContainerResetButtonStyle}">
|
||||
<FontIcon Glyph=""
|
||||
Style="{StaticResource SettingContainerFontIconStyle}" />
|
||||
</Button>
|
||||
</StackPanel>
|
||||
|
||||
<!-- This is where the actual setting control will go -->
|
||||
<ContentPresenter Content="{TemplateBinding Content}" />
|
||||
<Grid Height="60"
|
||||
HorizontalAlignment="Stretch"
|
||||
Margin="16"
|
||||
CornerRadius="4"
|
||||
Background="{ThemeResource SystemChromeMediumLowColor}">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="50" />
|
||||
<ColumnDefinition Width="*" />
|
||||
<ColumnDefinition Width="*" />
|
||||
</Grid.ColumnDefinitions>
|
||||
<FontIcon Grid.Column="0"
|
||||
Style="{StaticResource SettingContainerFontIconStyle}"
|
||||
Glyph="" />
|
||||
<StackPanel Grid.Column="1"
|
||||
Orientation="Vertical"
|
||||
VerticalAlignment="Center">
|
||||
<TextBlock Text="{TemplateBinding Header}"
|
||||
FontSize="16"/>
|
||||
<TextBlock Text="{TemplateBinding HelpText}"
|
||||
FontSize="14"
|
||||
Foreground="{ThemeResource SystemBaseMediumColor}"/>
|
||||
</StackPanel>
|
||||
<ContentPresenter Grid.Column="2"
|
||||
HorizontalAlignment="Right"
|
||||
VerticalAlignment="Center"
|
||||
Margin="8"
|
||||
BorderBrush="Transparent"
|
||||
Content="{TemplateBinding Content}"/>
|
||||
</Grid>
|
||||
</StackPanel>
|
||||
</ControlTemplate>
|
||||
</Setter.Value>
|
||||
|
|
Loading…
Reference in a new issue