Fix History/Memory tab item style in hight contrast theme

This commit is contained in:
Han Zhang 2024-01-16 16:03:59 +08:00
commit 32d39b1ff2

View file

@ -1170,178 +1170,207 @@
Tapped="DockPanelTapped" Tapped="DockPanelTapped"
Template="{StaticResource DockPanelTemplate}"> Template="{StaticResource DockPanelTemplate}">
<Pivot.Resources> <Pivot.Resources>
<!-- <ResourceDictionary>
This is a copy/paste of DefaultPivotHeaderItemStyle, but <ResourceDictionary.ThemeDictionaries>
1. Updated the Foreground in ViewStates. <ResourceDictionary x:Key="Default">
2. Updated the SelectedPipe <StaticResource x:Key="PivotHeaderItemForegroundUnselectedCustom" ResourceKey="TextFillColorPrimaryBrush"/>
--> <StaticResource x:Key="PivotHeaderItemForegroundUnselectedPointerOverCustom" ResourceKey="TextFillColorSecondaryBrush"/>
<Style TargetType="PivotHeaderItem"> <StaticResource x:Key="PivotHeaderItemForegroundUnselectedPressedCustom" ResourceKey="TextFillColorTertiaryBrush"/>
<Setter Property="FontSize" Value="{ThemeResource PivotHeaderItemFontSize}"/> <StaticResource x:Key="PivotHeaderItemForegroundSelectedCustom" ResourceKey="TextFillColorPrimaryBrush"/>
<Setter Property="FontFamily" Value="{ThemeResource PivotHeaderItemFontFamily}"/> <StaticResource x:Key="PivotHeaderItemForegroundSelectedPointerOverCustom" ResourceKey="TextFillColorSecondaryBrush"/>
<Setter Property="FontWeight" Value="{ThemeResource PivotHeaderItemThemeFontWeight}"/> <StaticResource x:Key="PivotHeaderItemForegroundSelectedPressedCustom" ResourceKey="TextFillColorTertiaryBrush"/>
<Setter Property="CharacterSpacing" Value="{ThemeResource PivotHeaderItemCharacterSpacing}"/> </ResourceDictionary>
<Setter Property="Background" Value="{ThemeResource PivotHeaderItemBackgroundUnselected}"/> <ResourceDictionary x:Key="HighContrast">
<Setter Property="Foreground" Value="{ThemeResource TextFillColorPrimaryBrush}"/> <StaticResource x:Key="PivotHeaderItemForegroundUnselectedCustom" ResourceKey="SystemControlForegroundBaseMediumBrush"/>
<Setter Property="Padding" Value="{ThemeResource PivotHeaderItemMargin}"/> <StaticResource x:Key="PivotHeaderItemForegroundUnselectedPointerOverCustom" ResourceKey="SystemControlHighlightAltBaseMediumHighBrush"/>
<Setter Property="Height" Value="48"/> <StaticResource x:Key="PivotHeaderItemForegroundUnselectedPressedCustom" ResourceKey="SystemControlHighlightAltBaseMediumHighBrush"/>
<Setter Property="VerticalContentAlignment" Value="Center"/> <StaticResource x:Key="PivotHeaderItemForegroundSelectedCustom" ResourceKey="SystemControlHighlightAltBaseHighBrush"/>
<Setter Property="IsTabStop" Value="False"/> <StaticResource x:Key="PivotHeaderItemForegroundSelectedPointerOverCustom" ResourceKey="SystemControlHighlightAltBaseMediumHighBrush"/>
<Setter Property="UseSystemFocusVisuals" Value="False"/> <StaticResource x:Key="PivotHeaderItemForegroundSelectedPressedCustom" ResourceKey="SystemControlHighlightAltBaseMediumHighBrush"/>
<Setter Property="Template"> </ResourceDictionary>
<Setter.Value> <ResourceDictionary x:Key="Light">
<ControlTemplate TargetType="PivotHeaderItem"> <StaticResource x:Key="PivotHeaderItemForegroundUnselectedCustom" ResourceKey="TextFillColorPrimaryBrush"/>
<Grid x:Name="Grid" <StaticResource x:Key="PivotHeaderItemForegroundUnselectedPointerOverCustom" ResourceKey="TextFillColorSecondaryBrush"/>
Padding="{TemplateBinding Padding}" <StaticResource x:Key="PivotHeaderItemForegroundUnselectedPressedCustom" ResourceKey="TextFillColorTertiaryBrush"/>
Background="{TemplateBinding Background}" <StaticResource x:Key="PivotHeaderItemForegroundSelectedCustom" ResourceKey="TextFillColorPrimaryBrush"/>
CornerRadius="{ThemeResource ControlCornerRadius}"> <StaticResource x:Key="PivotHeaderItemForegroundSelectedPointerOverCustom" ResourceKey="TextFillColorSecondaryBrush"/>
<StaticResource x:Key="PivotHeaderItemForegroundSelectedPressedCustom" ResourceKey="TextFillColorTertiaryBrush"/>
</ResourceDictionary>
</ResourceDictionary.ThemeDictionaries>
<Grid.RenderTransform> <!--
<TranslateTransform x:Name="ContentPresenterTranslateTransform"/> This is a copy/paste of DefaultPivotHeaderItemStyle, but
</Grid.RenderTransform> 1. Updated the Foreground in ViewStates.
2. Updated the SelectedPipe
-->
<Style TargetType="PivotHeaderItem">
<Setter Property="FontSize" Value="{ThemeResource PivotHeaderItemFontSize}"/>
<Setter Property="FontFamily" Value="{ThemeResource PivotHeaderItemFontFamily}"/>
<Setter Property="FontWeight" Value="{ThemeResource PivotHeaderItemThemeFontWeight}"/>
<Setter Property="CharacterSpacing" Value="{ThemeResource PivotHeaderItemCharacterSpacing}"/>
<Setter Property="Background" Value="{ThemeResource PivotHeaderItemBackgroundUnselected}"/>
<Setter Property="Foreground" Value="{ThemeResource PivotHeaderItemForegroundUnselectedCustom}"/>
<Setter Property="Padding" Value="{ThemeResource PivotHeaderItemMargin}"/>
<Setter Property="Height" Value="48"/>
<Setter Property="VerticalContentAlignment" Value="Center"/>
<Setter Property="IsTabStop" Value="False"/>
<Setter Property="UseSystemFocusVisuals" Value="False"/>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="PivotHeaderItem">
<Grid x:Name="Grid"
Padding="{TemplateBinding Padding}"
Background="{TemplateBinding Background}"
CornerRadius="{ThemeResource ControlCornerRadius}">
<VisualStateManager.VisualStateGroups> <Grid.RenderTransform>
<VisualStateGroup x:Name="SelectionStates"> <TranslateTransform x:Name="ContentPresenterTranslateTransform"/>
</Grid.RenderTransform>
<VisualStateGroup.Transitions> <VisualStateManager.VisualStateGroups>
<VisualTransition From="Unselected" <VisualStateGroup x:Name="SelectionStates">
GeneratedDuration="0:0:0.33"
To="UnselectedLocked"/>
<VisualTransition From="UnselectedLocked"
GeneratedDuration="0:0:0.33"
To="Unselected"/>
</VisualStateGroup.Transitions>
<VisualState x:Name="Disabled"> <VisualStateGroup.Transitions>
<VisualState.Setters> <VisualTransition From="Unselected"
<Setter Target="SelectedPipe.Visibility" Value="Collapsed"/> GeneratedDuration="0:0:0.33"
</VisualState.Setters> To="UnselectedLocked"/>
<VisualTransition From="UnselectedLocked"
GeneratedDuration="0:0:0.33"
To="Unselected"/>
</VisualStateGroup.Transitions>
<Storyboard> <VisualState x:Name="Disabled">
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground"> <VisualState.Setters>
<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextFillColorDisabledBrush}"/> <Setter Target="SelectedPipe.Visibility" Value="Collapsed"/>
</ObjectAnimationUsingKeyFrames> </VisualState.Setters>
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="Grid" Storyboard.TargetProperty="Background">
<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource PivotHeaderItemBackgroundDisabled}"/>
</ObjectAnimationUsingKeyFrames>
</Storyboard>
</VisualState>
<VisualState x:Name="Unselected">
<VisualState.Setters>
<Setter Target="SelectedPipe.Visibility" Value="Collapsed"/>
</VisualState.Setters>
</VisualState>
<VisualState x:Name="UnselectedLocked">
<VisualState.Setters>
<Setter Target="SelectedPipe.Visibility" Value="Collapsed"/>
</VisualState.Setters>
<Storyboard> <Storyboard>
<DoubleAnimation Duration="0" <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
Storyboard.TargetName="ContentPresenterTranslateTransform" <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextFillColorDisabledBrush}"/>
Storyboard.TargetProperty="X" </ObjectAnimationUsingKeyFrames>
To="{ThemeResource PivotHeaderItemLockedTranslation}"/> <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Grid" Storyboard.TargetProperty="Background">
<DoubleAnimation Duration="0" <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource PivotHeaderItemBackgroundDisabled}"/>
Storyboard.TargetName="ContentPresenter" </ObjectAnimationUsingKeyFrames>
Storyboard.TargetProperty="(UIElement.Opacity)" </Storyboard>
To="0"/> </VisualState>
</Storyboard> <VisualState x:Name="Unselected">
</VisualState> <VisualState.Setters>
<Setter Target="SelectedPipe.Visibility" Value="Collapsed"/>
</VisualState.Setters>
</VisualState>
<VisualState x:Name="UnselectedLocked">
<VisualState.Setters>
<Setter Target="SelectedPipe.Visibility" Value="Collapsed"/>
</VisualState.Setters>
<VisualState x:Name="Selected"> <Storyboard>
<DoubleAnimation Duration="0"
Storyboard.TargetName="ContentPresenterTranslateTransform"
Storyboard.TargetProperty="X"
To="{ThemeResource PivotHeaderItemLockedTranslation}"/>
<DoubleAnimation Duration="0"
Storyboard.TargetName="ContentPresenter"
Storyboard.TargetProperty="(UIElement.Opacity)"
To="0"/>
</Storyboard>
</VisualState>
<Storyboard> <VisualState x:Name="Selected">
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextFillColorPrimaryBrush}"/>
</ObjectAnimationUsingKeyFrames>
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="Grid" Storyboard.TargetProperty="Background">
<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource PivotHeaderItemBackgroundSelected}"/>
</ObjectAnimationUsingKeyFrames>
</Storyboard>
</VisualState>
<VisualState x:Name="UnselectedPointerOver">
<VisualState.Setters>
<Setter Target="SelectedPipe.Visibility" Value="Collapsed"/>
</VisualState.Setters>
<Storyboard> <Storyboard>
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground"> <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextFillColorSecondaryBrush}"/> <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource PivotHeaderItemForegroundSelectedCustom}"/>
</ObjectAnimationUsingKeyFrames> </ObjectAnimationUsingKeyFrames>
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="Grid" Storyboard.TargetProperty="Background"> <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Grid" Storyboard.TargetProperty="Background">
<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource PivotHeaderItemBackgroundUnselectedPointerOver}"/> <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource PivotHeaderItemBackgroundSelected}"/>
</ObjectAnimationUsingKeyFrames> </ObjectAnimationUsingKeyFrames>
</Storyboard> </Storyboard>
</VisualState> </VisualState>
<VisualState x:Name="SelectedPointerOver"> <VisualState x:Name="UnselectedPointerOver">
<VisualState.Setters>
<Setter Target="SelectedPipe.Visibility" Value="Collapsed"/>
</VisualState.Setters>
<Storyboard> <Storyboard>
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground"> <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextFillColorSecondaryBrush}"/> <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource PivotHeaderItemForegroundUnselectedPointerOverCustom}"/>
</ObjectAnimationUsingKeyFrames> </ObjectAnimationUsingKeyFrames>
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="Grid" Storyboard.TargetProperty="Background"> <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Grid" Storyboard.TargetProperty="Background">
<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource PivotHeaderItemBackgroundSelectedPointerOver}"/> <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource PivotHeaderItemBackgroundUnselectedPointerOver}"/>
</ObjectAnimationUsingKeyFrames> </ObjectAnimationUsingKeyFrames>
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="SelectedPipe" Storyboard.TargetProperty="Fill"> </Storyboard>
<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource AccentFillColorSecondaryBrush}"/> </VisualState>
</ObjectAnimationUsingKeyFrames> <VisualState x:Name="SelectedPointerOver">
</Storyboard>
</VisualState>
<VisualState x:Name="UnselectedPressed">
<VisualState.Setters>
<Setter Target="SelectedPipe.Visibility" Value="Collapsed"/>
</VisualState.Setters>
<Storyboard> <Storyboard>
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground"> <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextFillColorTertiaryBrush}"/> <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource PivotHeaderItemForegroundSelectedPointerOverCustom}"/>
</ObjectAnimationUsingKeyFrames> </ObjectAnimationUsingKeyFrames>
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="Grid" Storyboard.TargetProperty="Background"> <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Grid" Storyboard.TargetProperty="Background">
<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource PivotHeaderItemBackgroundUnselectedPressed}"/> <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource PivotHeaderItemBackgroundSelectedPointerOver}"/>
</ObjectAnimationUsingKeyFrames> </ObjectAnimationUsingKeyFrames>
</Storyboard> <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SelectedPipe" Storyboard.TargetProperty="Fill">
</VisualState> <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource AccentFillColorSecondaryBrush}"/>
<VisualState x:Name="SelectedPressed"> </ObjectAnimationUsingKeyFrames>
</Storyboard>
</VisualState>
<VisualState x:Name="UnselectedPressed">
<VisualState.Setters>
<Setter Target="SelectedPipe.Visibility" Value="Collapsed"/>
</VisualState.Setters>
<Storyboard> <Storyboard>
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground"> <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextFillColorTertiaryBrush}"/> <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource PivotHeaderItemForegroundUnselectedPressedCustom}"/>
</ObjectAnimationUsingKeyFrames> </ObjectAnimationUsingKeyFrames>
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="Grid" Storyboard.TargetProperty="Background"> <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Grid" Storyboard.TargetProperty="Background">
<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource PivotHeaderItemBackgroundSelectedPressed}"/> <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource PivotHeaderItemBackgroundUnselectedPressed}"/>
</ObjectAnimationUsingKeyFrames> </ObjectAnimationUsingKeyFrames>
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="SelectedPipe" Storyboard.TargetProperty="Fill"> </Storyboard>
<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource AccentFillColorTertiaryBrush}"/> </VisualState>
</ObjectAnimationUsingKeyFrames> <VisualState x:Name="SelectedPressed">
</Storyboard>
</VisualState>
</VisualStateGroup>
</VisualStateManager.VisualStateGroups> <Storyboard>
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource PivotHeaderItemForegroundSelectedPressedCustom}"/>
</ObjectAnimationUsingKeyFrames>
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="Grid" Storyboard.TargetProperty="Background">
<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource PivotHeaderItemBackgroundSelectedPressed}"/>
</ObjectAnimationUsingKeyFrames>
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="SelectedPipe" Storyboard.TargetProperty="Fill">
<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource AccentFillColorTertiaryBrush}"/>
</ObjectAnimationUsingKeyFrames>
</Storyboard>
</VisualState>
</VisualStateGroup>
<ContentPresenter x:Name="ContentPresenter" </VisualStateManager.VisualStateGroups>
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
FontFamily="{TemplateBinding FontFamily}"
FontSize="{TemplateBinding FontSize}"
FontWeight="{TemplateBinding FontWeight}"
Content="{TemplateBinding Content}"
ContentTemplate="{TemplateBinding ContentTemplate}"
OpticalMarginAlignment="TrimSideBearings"/>
<Rectangle x:Name="SelectedPipe"
Width="16"
Height="3"
Margin="0,0,0,2"
HorizontalAlignment="Center"
VerticalAlignment="Bottom"
Fill="{ThemeResource AccentFillColorDefaultBrush}"
RadiusX="1.5"
RadiusY="1.5"/>
</Grid> <ContentPresenter x:Name="ContentPresenter"
</ControlTemplate> HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
</Setter.Value> VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
</Setter> FontFamily="{TemplateBinding FontFamily}"
</Style> FontSize="{TemplateBinding FontSize}"
FontWeight="{TemplateBinding FontWeight}"
Content="{TemplateBinding Content}"
ContentTemplate="{TemplateBinding ContentTemplate}"
OpticalMarginAlignment="TrimSideBearings"/>
<Rectangle x:Name="SelectedPipe"
Width="16"
Height="3"
Margin="0,0,0,2"
HorizontalAlignment="Center"
VerticalAlignment="Bottom"
Fill="{ThemeResource AccentFillColorDefaultBrush}"
RadiusX="1.5"
RadiusY="1.5"/>
</Grid>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
</ResourceDictionary>
</Pivot.Resources> </Pivot.Resources>
<PivotItem x:Name="HistoryPivotItem" <PivotItem x:Name="HistoryPivotItem"
Margin="0,10,0,0" Margin="0,10,0,0"