Skip to content
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

Jump to bottom

Port microsoft/microsoft-ui-xaml#3951 #487

Merged
merged 1 commit into from
Jul 10, 2022
Merged

Port microsoft/microsoft-ui-xaml#3951 #487

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions ModernWpf/Styles/TabControl.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@
<Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource TabViewItemHeaderForegroundSelected}" />
<Setter TargetName="IconControl" Property="Foreground" Value="{DynamicResource TabViewItemIconForegroundSelected}" />
<Setter Property="Panel.ZIndex" Value="1" />
<Setter TargetName="ContentPresenter" Property="TextElement.FontWeight" Value="SemiBold"/>
</Trigger>
<!-- PointerOverSelected -->
<MultiTrigger>
Expand All @@ -140,6 +141,7 @@
<Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource TabViewItemHeaderForegroundPointerOver}" />
<Setter TargetName="IconControl" Property="Foreground" Value="{DynamicResource TabViewItemIconForegroundPointerOver}" />
<Setter Property="Panel.ZIndex" Value="1" />
<Setter TargetName="ContentPresenter" Property="TextElement.FontWeight" Value="SemiBold"/>
</MultiTrigger>
<!-- Disabled -->
<Trigger Property="IsEnabled" Value="False">
Expand Down
16 changes: 8 additions & 8 deletions ModernWpf/ThemeResources/Dark.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1434,22 +1434,22 @@
<m:StaticResource x:Key="TabViewBackground" ResourceKey="ControlFillColorTertiaryBrush" />
<m:StaticResource x:Key="TabViewItemHeaderBackground" ResourceKey="GhostFillColorTransparentBrush" />
<m:StaticResource x:Key="TabViewItemHeaderBackgroundSelected" ResourceKey="ControlFillColorInputActiveBrush" />
<m:StaticResource x:Key="TabViewItemHeaderBackgroundPointerOver" ResourceKey="SystemAltMediumLowColor" />
<m:StaticResource x:Key="TabViewItemHeaderBackgroundPressed" ResourceKey="SystemAltMediumColor" />
<SolidColorBrush x:Key="TabViewItemHeaderBackgroundPointerOver" Color="{m:StaticColor SystemAltMediumLowColor}" />
<SolidColorBrush x:Key="TabViewItemHeaderBackgroundPressed" Color="{m:StaticColor SystemAltMediumColor}" />
<m:StaticResource x:Key="TabViewItemHeaderBackgroundDisabled" ResourceKey="GhostFillColorTransparentBrush" />
<m:StaticResource x:Key="TabViewItemHeaderForeground" ResourceKey="TextFillColorPrimaryBrush" />
<m:StaticResource x:Key="TabViewItemHeaderForegroundPressed" ResourceKey="TextFillColorPrimaryBrush" />
<m:StaticResource x:Key="TabViewItemHeaderForegroundSelected" ResourceKey="TextFillColorPrimaryBrush" />
<m:StaticResource x:Key="TabViewItemHeaderForegroundPointerOver" ResourceKey="TextFillColorPrimaryBrush" />
<m:StaticResource x:Key="TabViewItemHeaderForegroundDisabled" ResourceKey="TextFillColorDisabledBrush" />
<m:StaticResource x:Key="TabViewItemIconForeground" ResourceKey="ControlAltFillColorTertiaryBrush" />
<m:StaticResource x:Key="TabViewItemIconForegroundPressed" ResourceKey="ControlAltFillColorTertiaryBrush" />
<m:StaticResource x:Key="TabViewItemIconForegroundSelected" ResourceKey="ControlAltFillColorTertiaryBrush" />
<m:StaticResource x:Key="TabViewItemIconForegroundPointerOver" ResourceKey="ControlAltFillColorTertiaryBrush" />
<m:StaticResource x:Key="TabViewItemIconForeground" ResourceKey="TextFillColorSecondaryBrush" />
<m:StaticResource x:Key="TabViewItemIconForegroundPressed" ResourceKey="TextFillColorSecondaryBrush" />
<m:StaticResource x:Key="TabViewItemIconForegroundSelected" ResourceKey="TextFillColorPrimaryBrush" />
<m:StaticResource x:Key="TabViewItemIconForegroundPointerOver" ResourceKey="TextFillColorSecondaryBrush" />
<m:StaticResource x:Key="TabViewItemIconForegroundDisabled" ResourceKey="TextFillColorDisabledBrush" />
<m:StaticResource x:Key="TabViewButtonBackground" ResourceKey="GhostFillColorTransparentBrush" />
<m:StaticResource x:Key="TabViewButtonBackgroundPressed" ResourceKey="SystemAltMediumColor" />
<m:StaticResource x:Key="TabViewButtonBackgroundPointerOver" ResourceKey="SystemAltMediumLowColor" />
<SolidColorBrush x:Key="TabViewButtonBackgroundPressed" Color="{m:StaticColor SystemAltMediumColor}" />
<SolidColorBrush x:Key="TabViewButtonBackgroundPointerOver" Color="{m:StaticColor SystemAltMediumLowColor}" />
<m:StaticResource x:Key="TabViewButtonBackgroundDisabled" ResourceKey="GhostFillColorTransparentBrush" />
<m:StaticResource x:Key="TabViewButtonForeground" ResourceKey="ControlAAFillColorDefaultBrush" />
<m:StaticResource x:Key="TabViewButtonForegroundPressed" ResourceKey="TextFillColorPrimaryBrush" />
Expand Down
16 changes: 8 additions & 8 deletions ModernWpf/ThemeResources/Light.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1433,22 +1433,22 @@
<m:StaticResource x:Key="TabViewBackground" ResourceKey="GhostFillColorSecondaryBrush" />
<m:StaticResource x:Key="TabViewItemHeaderBackground" ResourceKey="GhostFillColorTransparentBrush" />
<m:StaticResource x:Key="TabViewItemHeaderBackgroundSelected" ResourceKey="ControlFillColorInputActiveBrush" />
<m:StaticResource x:Key="TabViewItemHeaderBackgroundPointerOver" ResourceKey="SystemAltMediumLowColor" />
<m:StaticResource x:Key="TabViewItemHeaderBackgroundPressed" ResourceKey="SystemAltMediumColor" />
<SolidColorBrush x:Key="TabViewItemHeaderBackgroundPointerOver" Color="{m:StaticColor SystemAltMediumLowColor}" />
<SolidColorBrush x:Key="TabViewItemHeaderBackgroundPressed" Color="{m:StaticColor SystemAltMediumColor}" />
<m:StaticResource x:Key="TabViewItemHeaderBackgroundDisabled" ResourceKey="GhostFillColorTransparentBrush" />
<m:StaticResource x:Key="TabViewItemHeaderForeground" ResourceKey="TextFillColorPrimaryBrush" />
<m:StaticResource x:Key="TabViewItemHeaderForegroundPressed" ResourceKey="TextFillColorPrimaryBrush" />
<m:StaticResource x:Key="TabViewItemHeaderForegroundSelected" ResourceKey="TextFillColorPrimaryBrush" />
<m:StaticResource x:Key="TabViewItemHeaderForegroundPointerOver" ResourceKey="TextFillColorPrimaryBrush" />
<m:StaticResource x:Key="TabViewItemHeaderForegroundDisabled" ResourceKey="TextFillColorDisabledBrush" />
<m:StaticResource x:Key="TabViewItemIconForeground" ResourceKey="ControlAltFillColorTertiaryBrush" />
<m:StaticResource x:Key="TabViewItemIconForegroundPressed" ResourceKey="ControlAltFillColorTertiaryBrush" />
<m:StaticResource x:Key="TabViewItemIconForegroundSelected" ResourceKey="ControlAltFillColorTertiaryBrush" />
<m:StaticResource x:Key="TabViewItemIconForegroundPointerOver" ResourceKey="ControlAltFillColorTertiaryBrush" />
<m:StaticResource x:Key="TabViewItemIconForeground" ResourceKey="TextFillColorSecondaryBrush" />
<m:StaticResource x:Key="TabViewItemIconForegroundPressed" ResourceKey="TextFillColorSecondaryBrush" />
<m:StaticResource x:Key="TabViewItemIconForegroundSelected" ResourceKey="TextFillColorPrimaryBrush" />
<m:StaticResource x:Key="TabViewItemIconForegroundPointerOver" ResourceKey="TextFillColorSecondaryBrush" />
<m:StaticResource x:Key="TabViewItemIconForegroundDisabled" ResourceKey="TextFillColorDisabledBrush" />
<m:StaticResource x:Key="TabViewButtonBackground" ResourceKey="GhostFillColorTransparentBrush" />
<m:StaticResource x:Key="TabViewButtonBackgroundPressed" ResourceKey="SystemAltMediumColor" />
<m:StaticResource x:Key="TabViewButtonBackgroundPointerOver" ResourceKey="SystemAltMediumLowColor" />
<SolidColorBrush x:Key="TabViewButtonBackgroundPressed" Color="{m:StaticColor SystemAltMediumColor}" />
<SolidColorBrush x:Key="TabViewButtonBackgroundPointerOver" Color="{m:StaticColor SystemAltMediumLowColor}" />
<m:StaticResource x:Key="TabViewButtonBackgroundDisabled" ResourceKey="GhostFillColorTransparentBrush" />
<m:StaticResource x:Key="TabViewButtonForeground" ResourceKey="ControlAAFillColorDefaultBrush" />
<m:StaticResource x:Key="TabViewButtonForegroundPressed" ResourceKey="TextFillColorPrimaryBrush" />
Expand Down