Skip to content

[TabView] Update high contrast colors | MicaAlt colors - update high contrast colors #6787

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Mar 4, 2022
Merged

[TabView] Update high contrast colors | MicaAlt colors - update high contrast colors #6787

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
70d9b3b
date pickers
tashatitova Nov 3, 2021
a297304
adding time picker and flyout theming
tashatitova Nov 3, 2021
861faee
update background smoke for hc
tashatitova Nov 9, 2021
749cdd7
Merge branch 'user/tatito/dialog'
tashatitova Nov 9, 2021
f053b69
Merge branch 'main' of https://github.com/microsoft/microsoft-ui-xaml
tashatitova Nov 23, 2021
bc6b912
Merge branch 'main' of https://github.com/microsoft/microsoft-ui-xaml
tashatitova Feb 9, 2022
da78588
Merge branch 'main' of https://github.com/microsoft/microsoft-ui-xaml
tashatitova Feb 15, 2022
964303f
Merge branch 'main' of https://github.com/microsoft/microsoft-ui-xaml
tashatitova Feb 16, 2022
c43c775
Merge branch 'main' of https://github.com/microsoft/microsoft-ui-xaml
tashatitova Mar 3, 2022
621aca6
tab view hc updates
tashatitova Mar 4, 2022
fbfd705
updating the rest of the hc old brushes to new references, also, a bu…
tashatitova Mar 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions dev/CommonStyles/Common_themeresources_any.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -604,10 +604,10 @@
<SolidColorBrush x:Key="LayerOnAcrylicFillColorDefaultBrush" Color="{ThemeResource SystemColorWindowColor}" />
<SolidColorBrush x:Key="LayerOnAccentAcrylicFillColorDefaultBrush" Color="{ThemeResource SystemColorWindowColor}"/>

<SolidColorBrush x:Key="LayerOnMicaBaseAltFillColorDefaultBrush" Color="{ThemeResource SystemColorHighlightColor}" />
<SolidColorBrush x:Key="LayerOnMicaBaseAltFillColorSecondaryBrush" Color="{ThemeResource SystemColorHighlightColor}" />
<SolidColorBrush x:Key="LayerOnMicaBaseAltFillColorTertiaryBrush" Color="{ThemeResource SystemColorHighlightColor}" />
<SolidColorBrush x:Key="LayerOnMicaBaseAltFillColorTransparentBrush" Color="{ThemeResource SystemColorButtonFaceColor}" />
<SolidColorBrush x:Key="LayerOnMicaBaseAltFillColorDefaultBrush" Color="{ThemeResource SystemColorWindowColor}" />
<SolidColorBrush x:Key="LayerOnMicaBaseAltFillColorSecondaryBrush" Color="{ThemeResource SystemColorWindowColor}" />
<SolidColorBrush x:Key="LayerOnMicaBaseAltFillColorTertiaryBrush" Color="{ThemeResource SystemColorWindowColor}" />
<SolidColorBrush x:Key="LayerOnMicaBaseAltFillColorTransparentBrush" Color="{ThemeResource SystemColorWindowColor}" />

<SolidColorBrush x:Key="SolidBackgroundFillColorBaseBrush" Color="{ThemeResource SystemColorWindowColor}" />
<SolidColorBrush x:Key="SolidBackgroundFillColorSecondaryBrush" Color="{ThemeResource SystemColorWindowColor}" />
Expand Down
20 changes: 18 additions & 2 deletions dev/TabView/TabView.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,6 +300,8 @@
<Setter Property="Height" Value="{ThemeResource TabViewItemHeaderCloseButtonHeight}"/>
<Setter Property="Background" Value="{ThemeResource TabViewItemHeaderCloseButtonBackground}"/>
<Setter Property="Foreground" Value="{ThemeResource TabViewItemHeaderCloseButtonForeground}"/>
<Setter Property="BorderBrush" Value="{ThemeResource TabViewItemHeaderCloseButtonBorderBrush}"/>
<Setter Property="BorderThickness" Value="{ThemeResource TabViewItemHeaderCloseButtonBorderThickness}"/>
<Setter Property="FocusVisualMargin" Value="-3"/>
<Setter Property="Template">
<Setter.Value>
Expand All @@ -308,6 +310,8 @@
AutomationProperties.AccessibilityView="Raw"
contract7Present:BackgroundSizing="{TemplateBinding BackgroundSizing}"
Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
ContentTemplate="{TemplateBinding ContentTemplate}"
Content="{TemplateBinding Content}"
contract7Present:CornerRadius="{TemplateBinding CornerRadius}"
Expand All @@ -326,6 +330,9 @@
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TabViewItemHeaderCloseButtonForegroundPointerOver}"/>
</ObjectAnimationUsingKeyFrames>
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="BorderBrush">
<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TabViewItemHeaderCloseButtonBorderBrushPointerOver}"/>
</ObjectAnimationUsingKeyFrames>
</Storyboard>
</VisualState>
<VisualState x:Name="Pressed">
Expand All @@ -336,6 +343,9 @@
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TabViewItemHeaderCloseButtonForegroundPressed}"/>
</ObjectAnimationUsingKeyFrames>
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="BorderBrush">
<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TabViewItemHeaderCloseButtonBorderBrushPressed}"/>
</ObjectAnimationUsingKeyFrames>
</Storyboard>
</VisualState>
</VisualStateGroup>
Expand Down Expand Up @@ -470,6 +480,7 @@
<Setter Target="LeftRadiusRenderArc.Visibility" Value="Visible"/>
<Setter Target="SelectedBackgroundPath.Visibility" Value="Visible"/>
<Setter Target="SelectedBackgroundPath.Fill" Value="{ThemeResource TabViewItemHeaderBackgroundSelected}"/>
<Setter Target="TabContainer.Background" Value="{ThemeResource TabViewItemHeaderBackgroundSelected}" />
<Setter Target="TabContainer.Margin" Value="{ThemeResource TabViewSelectedItemHeaderMargin}"/>
<Setter Target="TabContainer.BorderBrush" Value="{ThemeResource TabViewSelectedItemBorderBrush}"/>
<Setter Target="TabContainer.BorderThickness" Value="{ThemeResource TabViewSelectedItemBorderThickness}"/>
Expand All @@ -490,6 +501,7 @@
<Setter Target="LeftRadiusRenderArc.Visibility" Value="Visible"/>
<Setter Target="SelectedBackgroundPath.Visibility" Value="Visible"/>
<Setter Target="SelectedBackgroundPath.Fill" Value="{ThemeResource TabViewItemHeaderBackgroundSelected}"/>
<Setter Target="TabContainer.Background" Value="{ThemeResource TabViewItemHeaderBackgroundSelected}" />
<Setter Target="TabContainer.Margin" Value="{ThemeResource TabViewSelectedItemHeaderMargin}"/>
<Setter Target="TabContainer.BorderBrush" Value="{ThemeResource TabViewSelectedItemBorderBrush}"/>
<Setter Target="TabContainer.BorderThickness" Value="{ThemeResource TabViewSelectedItemBorderThickness}"/>
Expand All @@ -498,6 +510,7 @@
<Setter Target="IconControl.Foreground" Value="{ThemeResource TabViewItemIconForegroundSelected}" />
<Setter Target="CloseButton.Background" Value="{ThemeResource TabViewItemHeaderSelectedCloseButtonBackground}" />
<Setter Target="CloseButton.Foreground" Value="{ThemeResource TabViewItemHeaderSelectedCloseButtonForeground}" />

<Setter Target="LayoutRoot.Background" Value="Transparent"/>
<Setter Target="ContentPresenter.FontWeight" Value="SemiBold"/>
</VisualState.Setters>
Expand All @@ -510,6 +523,7 @@
<Setter Target="LeftRadiusRenderArc.Visibility" Value="Visible"/>
<Setter Target="SelectedBackgroundPath.Visibility" Value="Visible"/>
<Setter Target="SelectedBackgroundPath.Fill" Value="{ThemeResource TabViewItemHeaderBackgroundSelected}"/>
<Setter Target="TabContainer.Background" Value="{ThemeResource TabViewItemHeaderBackgroundSelected}" />
<Setter Target="TabContainer.Margin" Value="{ThemeResource TabViewSelectedItemHeaderMargin}"/>
<Setter Target="TabContainer.BorderBrush" Value="{ThemeResource TabViewSelectedItemBorderBrush}"/>
<Setter Target="TabContainer.BorderThickness" Value="{ThemeResource TabViewSelectedItemBorderThickness}"/>
Expand All @@ -518,6 +532,7 @@
<Setter Target="IconControl.Foreground" Value="{ThemeResource TabViewItemIconForegroundSelected}" />
<Setter Target="CloseButton.Background" Value="{ThemeResource TabViewItemHeaderSelectedCloseButtonBackground}" />
<Setter Target="CloseButton.Foreground" Value="{ThemeResource TabViewItemHeaderSelectedCloseButtonForeground}" />
<Setter Target="CloseButton.BorderBrush" Value="{ThemeResource TabViewItemHeaderCloseButtonBorderBrushSelected}" />
<Setter Target="LayoutRoot.Background" Value="Transparent"/>
<Setter Target="ContentPresenter.FontWeight" Value="SemiBold"/>
</VisualState.Setters>
Expand All @@ -535,6 +550,7 @@
<Setter Target="IconControl.Foreground" Value="{ThemeResource TabViewButtonForegroundDisabled}" />
<Setter Target="CloseButton.Background" Value="{ThemeResource TabViewItemHeaderDisabledCloseButtonBackground}" />
<Setter Target="CloseButton.Foreground" Value="{ThemeResource TabViewItemHeaderDisabledCloseButtonForeground}" />
<Setter Target="CloseButton.BorderBrush" Value="{ThemeResource TabViewItemHeaderCloseButtonBorderBrushDisabled}" />
</VisualState.Setters>
</VisualState>
</VisualStateGroup>
Expand Down Expand Up @@ -708,7 +724,7 @@

<Path x:Name="LeftRadiusRenderArc"
x:Load="False"
Fill="{ThemeResource CardStrokeColorDefault}"
Fill="{ThemeResource TabViewBorderBrush}"
VerticalAlignment="Bottom"
Visibility="Collapsed"
Margin="-4,0,0,0"
Expand All @@ -720,7 +736,7 @@
x:Load="False"
Grid.Column="2"
Visibility="Collapsed"
Fill="{ThemeResource CardStrokeColorDefault}"
Fill="{ThemeResource TabViewBorderBrush}"
VerticalAlignment="Bottom"
Margin="0,0,-4,0"
Height="4"
Expand Down
Loading