Skip to content

Commit d2686fc

Browse files
KinnaraKinnara
authored
1 parent 846795c commit d2686fc

File tree

3 files changed

+18
-16
lines changed

3 files changed

+18
-16
lines changed

‎ModernWpf/Styles/TabControl.xaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@
129129
<Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource TabViewItemHeaderForegroundSelected}" />
130130
<Setter TargetName="IconControl" Property="Foreground" Value="{DynamicResource TabViewItemIconForegroundSelected}" />
131131
<Setter Property="Panel.ZIndex" Value="1" />
132+
<Setter TargetName="ContentPresenter" Property="TextElement.FontWeight" Value="SemiBold"/>
132133
</Trigger>
133134
<!-- PointerOverSelected -->
134135
<MultiTrigger>
@@ -140,6 +141,7 @@
140141
<Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource TabViewItemHeaderForegroundPointerOver}" />
141142
<Setter TargetName="IconControl" Property="Foreground" Value="{DynamicResource TabViewItemIconForegroundPointerOver}" />
142143
<Setter Property="Panel.ZIndex" Value="1" />
144+
<Setter TargetName="ContentPresenter" Property="TextElement.FontWeight" Value="SemiBold"/>
143145
</MultiTrigger>
144146
<!-- Disabled -->
145147
<Trigger Property="IsEnabled" Value="False">

‎ModernWpf/ThemeResources/Dark.xaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1434,22 +1434,22 @@
14341434
<m:StaticResource x:Key="TabViewBackground" ResourceKey="ControlFillColorTertiaryBrush" />
14351435
<m:StaticResource x:Key="TabViewItemHeaderBackground" ResourceKey="GhostFillColorTransparentBrush" />
14361436
<m:StaticResource x:Key="TabViewItemHeaderBackgroundSelected" ResourceKey="ControlFillColorInputActiveBrush" />
1437-
<m:StaticResource x:Key="TabViewItemHeaderBackgroundPointerOver" ResourceKey="SystemAltMediumLowColor" />
1438-
<m:StaticResource x:Key="TabViewItemHeaderBackgroundPressed" ResourceKey="SystemAltMediumColor" />
1437+
<SolidColorBrush x:Key="TabViewItemHeaderBackgroundPointerOver" Color="{m:StaticColor SystemAltMediumLowColor}" />
1438+
<SolidColorBrush x:Key="TabViewItemHeaderBackgroundPressed" Color="{m:StaticColor SystemAltMediumColor}" />
14391439
<m:StaticResource x:Key="TabViewItemHeaderBackgroundDisabled" ResourceKey="GhostFillColorTransparentBrush" />
14401440
<m:StaticResource x:Key="TabViewItemHeaderForeground" ResourceKey="TextFillColorPrimaryBrush" />
14411441
<m:StaticResource x:Key="TabViewItemHeaderForegroundPressed" ResourceKey="TextFillColorPrimaryBrush" />
14421442
<m:StaticResource x:Key="TabViewItemHeaderForegroundSelected" ResourceKey="TextFillColorPrimaryBrush" />
14431443
<m:StaticResource x:Key="TabViewItemHeaderForegroundPointerOver" ResourceKey="TextFillColorPrimaryBrush" />
14441444
<m:StaticResource x:Key="TabViewItemHeaderForegroundDisabled" ResourceKey="TextFillColorDisabledBrush" />
1445-
<m:StaticResource x:Key="TabViewItemIconForeground" ResourceKey="ControlAltFillColorTertiaryBrush" />
1446-
<m:StaticResource x:Key="TabViewItemIconForegroundPressed" ResourceKey="ControlAltFillColorTertiaryBrush" />
1447-
<m:StaticResource x:Key="TabViewItemIconForegroundSelected" ResourceKey="ControlAltFillColorTertiaryBrush" />
1448-
<m:StaticResource x:Key="TabViewItemIconForegroundPointerOver" ResourceKey="ControlAltFillColorTertiaryBrush" />
1445+
<m:StaticResource x:Key="TabViewItemIconForeground" ResourceKey="TextFillColorSecondaryBrush" />
1446+
<m:StaticResource x:Key="TabViewItemIconForegroundPressed" ResourceKey="TextFillColorSecondaryBrush" />
1447+
<m:StaticResource x:Key="TabViewItemIconForegroundSelected" ResourceKey="TextFillColorPrimaryBrush" />
1448+
<m:StaticResource x:Key="TabViewItemIconForegroundPointerOver" ResourceKey="TextFillColorSecondaryBrush" />
14491449
<m:StaticResource x:Key="TabViewItemIconForegroundDisabled" ResourceKey="TextFillColorDisabledBrush" />
14501450
<m:StaticResource x:Key="TabViewButtonBackground" ResourceKey="GhostFillColorTransparentBrush" />
1451-
<m:StaticResource x:Key="TabViewButtonBackgroundPressed" ResourceKey="SystemAltMediumColor" />
1452-
<m:StaticResource x:Key="TabViewButtonBackgroundPointerOver" ResourceKey="SystemAltMediumLowColor" />
1451+
<SolidColorBrush x:Key="TabViewButtonBackgroundPressed" Color="{m:StaticColor SystemAltMediumColor}" />
1452+
<SolidColorBrush x:Key="TabViewButtonBackgroundPointerOver" Color="{m:StaticColor SystemAltMediumLowColor}" />
14531453
<m:StaticResource x:Key="TabViewButtonBackgroundDisabled" ResourceKey="GhostFillColorTransparentBrush" />
14541454
<m:StaticResource x:Key="TabViewButtonForeground" ResourceKey="ControlAAFillColorDefaultBrush" />
14551455
<m:StaticResource x:Key="TabViewButtonForegroundPressed" ResourceKey="TextFillColorPrimaryBrush" />

‎ModernWpf/ThemeResources/Light.xaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1433,22 +1433,22 @@
14331433
<m:StaticResource x:Key="TabViewBackground" ResourceKey="GhostFillColorSecondaryBrush" />
14341434
<m:StaticResource x:Key="TabViewItemHeaderBackground" ResourceKey="GhostFillColorTransparentBrush" />
14351435
<m:StaticResource x:Key="TabViewItemHeaderBackgroundSelected" ResourceKey="ControlFillColorInputActiveBrush" />
1436-
<m:StaticResource x:Key="TabViewItemHeaderBackgroundPointerOver" ResourceKey="SystemAltMediumLowColor" />
1437-
<m:StaticResource x:Key="TabViewItemHeaderBackgroundPressed" ResourceKey="SystemAltMediumColor" />
1436+
<SolidColorBrush x:Key="TabViewItemHeaderBackgroundPointerOver" Color="{m:StaticColor SystemAltMediumLowColor}" />
1437+
<SolidColorBrush x:Key="TabViewItemHeaderBackgroundPressed" Color="{m:StaticColor SystemAltMediumColor}" />
14381438
<m:StaticResource x:Key="TabViewItemHeaderBackgroundDisabled" ResourceKey="GhostFillColorTransparentBrush" />
14391439
<m:StaticResource x:Key="TabViewItemHeaderForeground" ResourceKey="TextFillColorPrimaryBrush" />
14401440
<m:StaticResource x:Key="TabViewItemHeaderForegroundPressed" ResourceKey="TextFillColorPrimaryBrush" />
14411441
<m:StaticResource x:Key="TabViewItemHeaderForegroundSelected" ResourceKey="TextFillColorPrimaryBrush" />
14421442
<m:StaticResource x:Key="TabViewItemHeaderForegroundPointerOver" ResourceKey="TextFillColorPrimaryBrush" />
14431443
<m:StaticResource x:Key="TabViewItemHeaderForegroundDisabled" ResourceKey="TextFillColorDisabledBrush" />
1444-
<m:StaticResource x:Key="TabViewItemIconForeground" ResourceKey="ControlAltFillColorTertiaryBrush" />
1445-
<m:StaticResource x:Key="TabViewItemIconForegroundPressed" ResourceKey="ControlAltFillColorTertiaryBrush" />
1446-
<m:StaticResource x:Key="TabViewItemIconForegroundSelected" ResourceKey="ControlAltFillColorTertiaryBrush" />
1447-
<m:StaticResource x:Key="TabViewItemIconForegroundPointerOver" ResourceKey="ControlAltFillColorTertiaryBrush" />
1444+
<m:StaticResource x:Key="TabViewItemIconForeground" ResourceKey="TextFillColorSecondaryBrush" />
1445+
<m:StaticResource x:Key="TabViewItemIconForegroundPressed" ResourceKey="TextFillColorSecondaryBrush" />
1446+
<m:StaticResource x:Key="TabViewItemIconForegroundSelected" ResourceKey="TextFillColorPrimaryBrush" />
1447+
<m:StaticResource x:Key="TabViewItemIconForegroundPointerOver" ResourceKey="TextFillColorSecondaryBrush" />
14481448
<m:StaticResource x:Key="TabViewItemIconForegroundDisabled" ResourceKey="TextFillColorDisabledBrush" />
14491449
<m:StaticResource x:Key="TabViewButtonBackground" ResourceKey="GhostFillColorTransparentBrush" />
1450-
<m:StaticResource x:Key="TabViewButtonBackgroundPressed" ResourceKey="SystemAltMediumColor" />
1451-
<m:StaticResource x:Key="TabViewButtonBackgroundPointerOver" ResourceKey="SystemAltMediumLowColor" />
1450+
<SolidColorBrush x:Key="TabViewButtonBackgroundPressed" Color="{m:StaticColor SystemAltMediumColor}" />
1451+
<SolidColorBrush x:Key="TabViewButtonBackgroundPointerOver" Color="{m:StaticColor SystemAltMediumLowColor}" />
14521452
<m:StaticResource x:Key="TabViewButtonBackgroundDisabled" ResourceKey="GhostFillColorTransparentBrush" />
14531453
<m:StaticResource x:Key="TabViewButtonForeground" ResourceKey="ControlAAFillColorDefaultBrush" />
14541454
<m:StaticResource x:Key="TabViewButtonForegroundPressed" ResourceKey="TextFillColorPrimaryBrush" />

0 commit comments

Comments
 (0)