@@ -28,6 +28,7 @@ Themes\Styles\Controls\AnimatedImage.xaml
2828Themes\Styles\Controls\ArcProgress.xaml
2929Themes\Styles\Controls\BreadcrumbNavigator.xaml
3030Themes\Styles\Controls\CalendarWithClockStyle.xaml
31+ Themes\Styles\Controls\Card.xaml
3132Themes\Styles\Controls\Clock.xaml
3233Themes\Styles\Controls\ClockRadioButton.xaml
3334Themes\Styles\Controls\ColorfulShimmingEffect.xaml
@@ -829,6 +830,48 @@ Themes\Styles\Win2D\Watermark.xaml
829830 <Setter Property="FontWeight" Value="SemiBold" />
830831 <Setter Property="Foreground" Value="{ThemeResource TextFillColorTertiaryBrush}" />
831832 </Style>
833+ <Style x:Key="DefaultCardStyle" TargetType="local:Card">
834+ <Setter Property="Padding" Value="8" />
835+ <Setter Property="HorizontalContentAlignment" Value="Stretch" />
836+ <Setter Property="VerticalContentAlignment" Value="Stretch" />
837+ <Setter Property="CornerRadius" Value="{ThemeResource OverlayCornerRadius}" />
838+ <Setter Property="Background" Value="{ThemeResource CardBackgroundFillColorDefaultBrush}" />
839+ <Setter Property="BorderBrush" Value="{ThemeResource CardStrokeColorDefaultBrush}" />
840+ <Setter Property="BorderThickness" Value="1" />
841+ <Setter Property="Template">
842+ <Setter.Value>
843+ <ControlTemplate TargetType="local:Card">
844+ <Grid VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding CornerRadius}">
845+ <Grid.RowDefinitions>
846+ <RowDefinition Height="Auto" MinHeight="44" />
847+ <RowDefinition Height="Auto" />
848+ <RowDefinition Height="*" />
849+ </Grid.RowDefinitions>
850+ <VisualStateManager.VisualStateGroups>
851+ <VisualStateGroup x:Name="TitleGridVisibilityStates">
852+ <VisualState x:Name="TitleGridVisible" />
853+ <VisualState x:Name="TitleGridCollapsed">
854+ <VisualState.Setters>
855+ <Setter Target="TitleGrid.Visibility" Value="Collapsed" />
856+ </VisualState.Setters>
857+ </VisualState>
858+ </VisualStateGroup>
859+ </VisualStateManager.VisualStateGroups>
860+ <Grid x:Name="TitleGrid">
861+ <Grid.ColumnDefinitions>
862+ <ColumnDefinition Width="*" />
863+ <ColumnDefinition Width="Auto" />
864+ </Grid.ColumnDefinitions>
865+ <TextBlock Margin="16,0,0,0" VerticalAlignment="Center" FontSize="16" FontWeight="SemiBold" Text="{TemplateBinding Title}" />
866+ <ContentPresenter Grid.Column="2" HorizontalAlignment="Right" VerticalAlignment="Center" Content="{TemplateBinding TitleContent}" />
867+ </Grid>
868+ <Rectangle x:Name="Divider" Grid.Row="1" Height="1" HorizontalAlignment="Stretch" Fill="{ThemeResource DividerStrokeColorDefaultBrush}" Visibility="{TemplateBinding DividerVisibility}" />
869+ <ContentPresenter Grid.Row="2" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Content="{TemplateBinding Content}" />
870+ </Grid>
871+ </ControlTemplate>
872+ </Setter.Value>
873+ </Setter>
874+ </Style>
832875 <Style x:Key="DefaultClockStyle" TargetType="local:Clock">
833876 <Setter Property="BorderThickness" Value="1" />
834877 <Setter Property="Margin" Value="8,0" />
@@ -6203,6 +6246,7 @@ Themes\Styles\Win2D\Watermark.xaml
62036246 <TimePicker x:Name="PART_TimePicker" Grid.Column="1" Margin="{TemplateBinding TimePickerMargin}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
62046247 </Grid>
62056248 </ControlTemplate>
6249+ <Style BasedOn="{StaticResource DefaultCardStyle}" TargetType="local:Card" />
62066250 <Style BasedOn="{StaticResource DefaultClockStyle}" TargetType="local:Clock" />
62076251 <Style BasedOn="{StaticResource DefaultClockRadioButtonStyle}" TargetType="local:ClockRadioButton" />
62086252 <Style BasedOn="{StaticResource DefaultColorfulShimmingEffectStyle}" TargetType="local:ColorfulShimmingEffect" />
0 commit comments