Skip to content

Commit

Permalink
Port microsoft/microsoft-ui-xaml#4754
Browse files Browse the repository at this point in the history
  • Loading branch information
@Kinnara
Kinnara committed Dec 7, 2023
1 parent f82124d commit 449496f
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 34 deletions.
34 changes: 17 additions & 17 deletions ModernWpf/ThemeResources/Dark.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1499,28 +1499,28 @@
<m:StaticResource x:Key="SplitViewLightDismissOverlayBackground" ResourceKey="SystemControlPageBackgroundMediumAltMediumBrush" />

<!-- Resources for TabView -->
<m:StaticResource x:Key="TabViewBackground" ResourceKey="ControlFillColorTertiaryBrush" />
<m:StaticResource x:Key="TabViewBackground" ResourceKey="SolidBackgroundFillColorBaseBrush" />
<m:StaticResource x:Key="TabViewItemHeaderBackground" ResourceKey="SubtleFillColorTransparentBrush" />
<m:StaticResource x:Key="TabViewItemHeaderBackgroundSelected" ResourceKey="ControlFillColorInputActiveBrush" />
<SolidColorBrush x:Key="TabViewItemHeaderBackgroundPointerOver" Color="{m:StaticColor SystemAltMediumLowColor}" />
<SolidColorBrush x:Key="TabViewItemHeaderBackgroundPressed" Color="{m:StaticColor SystemAltMediumColor}" />
<m:StaticResource x:Key="TabViewItemHeaderBackgroundSelected" ResourceKey="SolidBackgroundFillColorQuarternary" />
<m:StaticResource x:Key="TabViewItemHeaderBackgroundPointerOver" ResourceKey="SubtleFillColorSecondaryBrush" />
<m:StaticResource x:Key="TabViewItemHeaderBackgroundPressed" ResourceKey="SubtleFillColorTertiaryBrush" />
<m:StaticResource x:Key="TabViewItemHeaderBackgroundDisabled" ResourceKey="SubtleFillColorTransparentBrush" />
<m:StaticResource x:Key="TabViewItemHeaderForeground" ResourceKey="TextFillColorPrimaryBrush" />
<m:StaticResource x:Key="TabViewItemHeaderForegroundPressed" ResourceKey="TextFillColorPrimaryBrush" />
<m:StaticResource x:Key="TabViewItemHeaderForeground" ResourceKey="TextFillColorSecondaryBrush" />
<m:StaticResource x:Key="TabViewItemHeaderForegroundPressed" ResourceKey="TextFillColorTertiaryBrush" />
<m:StaticResource x:Key="TabViewItemHeaderForegroundSelected" ResourceKey="TextFillColorPrimaryBrush" />
<m:StaticResource x:Key="TabViewItemHeaderForegroundPointerOver" ResourceKey="TextFillColorPrimaryBrush" />
<m:StaticResource x:Key="TabViewItemHeaderForegroundPointerOver" ResourceKey="TextFillColorSecondaryBrush" />
<m:StaticResource x:Key="TabViewItemHeaderForegroundDisabled" ResourceKey="TextFillColorDisabledBrush" />
<m:StaticResource x:Key="TabViewItemIconForeground" ResourceKey="TextFillColorSecondaryBrush" />
<m:StaticResource x:Key="TabViewItemIconForegroundPressed" ResourceKey="TextFillColorSecondaryBrush" />
<m:StaticResource x:Key="TabViewItemIconForegroundPressed" ResourceKey="TextFillColorTertiaryBrush" />
<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="SubtleFillColorTransparentBrush" />
<SolidColorBrush x:Key="TabViewButtonBackgroundPressed" Color="{m:StaticColor SystemAltMediumColor}" />
<SolidColorBrush x:Key="TabViewButtonBackgroundPointerOver" Color="{m:StaticColor SystemAltMediumLowColor}" />
<m:StaticResource x:Key="TabViewButtonBackgroundPressed" ResourceKey="SubtleFillColorTertiaryBrush" />
<m:StaticResource x:Key="TabViewButtonBackgroundPointerOver" ResourceKey="SubtleFillColorSecondaryBrush" />
<m:StaticResource x:Key="TabViewButtonBackgroundDisabled" ResourceKey="SubtleFillColorTransparentBrush" />
<m:StaticResource x:Key="TabViewButtonForeground" ResourceKey="ControlStrongFillColorDefaultBrush" />
<m:StaticResource x:Key="TabViewButtonForegroundPressed" ResourceKey="TextFillColorPrimaryBrush" />
<m:StaticResource x:Key="TabViewButtonForeground" ResourceKey="TextFillColorPrimaryBrush" />
<m:StaticResource x:Key="TabViewButtonForegroundPressed" ResourceKey="TextFillColorSecondaryBrush" />
<m:StaticResource x:Key="TabViewButtonForegroundPointerOver" ResourceKey="TextFillColorPrimaryBrush" />
<m:StaticResource x:Key="TabViewButtonForegroundDisabled" ResourceKey="TextFillColorDisabledBrush" />
<m:StaticResource x:Key="TabViewScrollButtonBackground" ResourceKey="SubtleFillColorTransparentBrush" />
Expand All @@ -1532,12 +1532,12 @@
<m:StaticResource x:Key="TabViewItemHeaderPointerOverCloseButtonBackground" ResourceKey="SubtleFillColorTransparentBrush" />
<m:StaticResource x:Key="TabViewItemHeaderSelectedCloseButtonBackground" ResourceKey="SubtleFillColorTransparentBrush" />
<m:StaticResource x:Key="TabViewItemHeaderDisabledCloseButtonBackground" ResourceKey="SubtleFillColorTransparentBrush" />
<m:StaticResource x:Key="TabViewItemHeaderCloseButtonForeground" ResourceKey="ControlStrongFillColorDefaultBrush" />
<m:StaticResource x:Key="TabViewItemHeaderCloseButtonForeground" ResourceKey="TextFillColorPrimaryBrush" />
<m:StaticResource x:Key="TabViewItemHeaderCloseButtonForegroundPressed" ResourceKey="TextFillColorSecondaryBrush" />
<m:StaticResource x:Key="TabViewItemHeaderCloseButtonForegroundPointerOver" ResourceKey="TextFillColorSecondaryBrush" />
<m:StaticResource x:Key="TabViewItemHeaderPressedCloseButtonForeground" ResourceKey="ControlStrongFillColorDefaultBrush" />
<m:StaticResource x:Key="TabViewItemHeaderPointerOverCloseButtonForeground" ResourceKey="ControlStrongFillColorDefaultBrush" />
<m:StaticResource x:Key="TabViewItemHeaderSelectedCloseButtonForeground" ResourceKey="ControlStrongFillColorDefaultBrush" />
<m:StaticResource x:Key="TabViewItemHeaderCloseButtonForegroundPointerOver" ResourceKey="TextFillColorPrimaryBrush" />
<m:StaticResource x:Key="TabViewItemHeaderPressedCloseButtonForeground" ResourceKey="TextFillColorPrimaryBrush" />
<m:StaticResource x:Key="TabViewItemHeaderPointerOverCloseButtonForeground" ResourceKey="TextFillColorPrimaryBrush" />
<m:StaticResource x:Key="TabViewItemHeaderSelectedCloseButtonForeground" ResourceKey="TextFillColorPrimaryBrush" />
<m:StaticResource x:Key="TabViewItemHeaderDisabledCloseButtonForeground" ResourceKey="TextFillColorDisabledBrush" />

<!-- Resources for Thumb -->
Expand Down
34 changes: 17 additions & 17 deletions ModernWpf/ThemeResources/Light.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1501,28 +1501,28 @@
<m:StaticResource x:Key="SplitViewLightDismissOverlayBackground" ResourceKey="SystemControlPageBackgroundMediumAltMediumBrush" />

<!-- Resources for TabView -->
<m:StaticResource x:Key="TabViewBackground" ResourceKey="SubtleFillColorSecondaryBrush" />
<m:StaticResource x:Key="TabViewBackground" ResourceKey="SolidBackgroundFillColorBaseBrush" />
<m:StaticResource x:Key="TabViewItemHeaderBackground" ResourceKey="SubtleFillColorTransparentBrush" />
<m:StaticResource x:Key="TabViewItemHeaderBackgroundSelected" ResourceKey="ControlFillColorInputActiveBrush" />
<SolidColorBrush x:Key="TabViewItemHeaderBackgroundPointerOver" Color="{m:StaticColor SystemAltMediumLowColor}" />
<SolidColorBrush x:Key="TabViewItemHeaderBackgroundPressed" Color="{m:StaticColor SystemAltMediumColor}" />
<m:StaticResource x:Key="TabViewItemHeaderBackgroundSelected" ResourceKey="SolidBackgroundFillColorQuarternary" />
<m:StaticResource x:Key="TabViewItemHeaderBackgroundPointerOver" ResourceKey="SubtleFillColorSecondaryBrush" />
<m:StaticResource x:Key="TabViewItemHeaderBackgroundPressed" ResourceKey="SubtleFillColorTertiaryBrush" />
<m:StaticResource x:Key="TabViewItemHeaderBackgroundDisabled" ResourceKey="SubtleFillColorTransparentBrush" />
<m:StaticResource x:Key="TabViewItemHeaderForeground" ResourceKey="TextFillColorPrimaryBrush" />
<m:StaticResource x:Key="TabViewItemHeaderForegroundPressed" ResourceKey="TextFillColorPrimaryBrush" />
<m:StaticResource x:Key="TabViewItemHeaderForeground" ResourceKey="TextFillColorSecondaryBrush" />
<m:StaticResource x:Key="TabViewItemHeaderForegroundPressed" ResourceKey="TextFillColorTertiaryBrush" />
<m:StaticResource x:Key="TabViewItemHeaderForegroundSelected" ResourceKey="TextFillColorPrimaryBrush" />
<m:StaticResource x:Key="TabViewItemHeaderForegroundPointerOver" ResourceKey="TextFillColorPrimaryBrush" />
<m:StaticResource x:Key="TabViewItemHeaderForegroundPointerOver" ResourceKey="TextFillColorSecondaryBrush" />
<m:StaticResource x:Key="TabViewItemHeaderForegroundDisabled" ResourceKey="TextFillColorDisabledBrush" />
<m:StaticResource x:Key="TabViewItemIconForeground" ResourceKey="TextFillColorSecondaryBrush" />
<m:StaticResource x:Key="TabViewItemIconForegroundPressed" ResourceKey="TextFillColorSecondaryBrush" />
<m:StaticResource x:Key="TabViewItemIconForegroundPressed" ResourceKey="TextFillColorTertiaryBrush" />
<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="SubtleFillColorTransparentBrush" />
<SolidColorBrush x:Key="TabViewButtonBackgroundPressed" Color="{m:StaticColor SystemAltMediumColor}" />
<SolidColorBrush x:Key="TabViewButtonBackgroundPointerOver" Color="{m:StaticColor SystemAltMediumLowColor}" />
<m:StaticResource x:Key="TabViewButtonBackgroundPressed" ResourceKey="SubtleFillColorTertiaryBrush" />
<m:StaticResource x:Key="TabViewButtonBackgroundPointerOver" ResourceKey="SubtleFillColorSecondaryBrush" />
<m:StaticResource x:Key="TabViewButtonBackgroundDisabled" ResourceKey="SubtleFillColorTransparentBrush" />
<m:StaticResource x:Key="TabViewButtonForeground" ResourceKey="ControlStrongFillColorDefaultBrush" />
<m:StaticResource x:Key="TabViewButtonForegroundPressed" ResourceKey="TextFillColorPrimaryBrush" />
<m:StaticResource x:Key="TabViewButtonForeground" ResourceKey="TextFillColorPrimaryBrush" />
<m:StaticResource x:Key="TabViewButtonForegroundPressed" ResourceKey="TextFillColorSecondaryBrush" />
<m:StaticResource x:Key="TabViewButtonForegroundPointerOver" ResourceKey="TextFillColorPrimaryBrush" />
<m:StaticResource x:Key="TabViewButtonForegroundDisabled" ResourceKey="TextFillColorDisabledBrush" />
<m:StaticResource x:Key="TabViewScrollButtonBackground" ResourceKey="SubtleFillColorTransparentBrush" />
Expand All @@ -1534,12 +1534,12 @@
<m:StaticResource x:Key="TabViewItemHeaderPointerOverCloseButtonBackground" ResourceKey="SubtleFillColorTransparentBrush" />
<m:StaticResource x:Key="TabViewItemHeaderSelectedCloseButtonBackground" ResourceKey="SubtleFillColorTransparentBrush" />
<m:StaticResource x:Key="TabViewItemHeaderDisabledCloseButtonBackground" ResourceKey="SubtleFillColorTransparentBrush" />
<m:StaticResource x:Key="TabViewItemHeaderCloseButtonForeground" ResourceKey="ControlStrongFillColorDefaultBrush" />
<m:StaticResource x:Key="TabViewItemHeaderCloseButtonForeground" ResourceKey="TextFillColorPrimaryBrush" />
<m:StaticResource x:Key="TabViewItemHeaderCloseButtonForegroundPressed" ResourceKey="TextFillColorSecondaryBrush" />
<m:StaticResource x:Key="TabViewItemHeaderCloseButtonForegroundPointerOver" ResourceKey="TextFillColorSecondaryBrush" />
<m:StaticResource x:Key="TabViewItemHeaderPressedCloseButtonForeground" ResourceKey="ControlStrongFillColorDefaultBrush" />
<m:StaticResource x:Key="TabViewItemHeaderPointerOverCloseButtonForeground" ResourceKey="ControlStrongFillColorDefaultBrush" />
<m:StaticResource x:Key="TabViewItemHeaderSelectedCloseButtonForeground" ResourceKey="ControlStrongFillColorDefaultBrush" />
<m:StaticResource x:Key="TabViewItemHeaderCloseButtonForegroundPointerOver" ResourceKey="TextFillColorPrimaryBrush" />
<m:StaticResource x:Key="TabViewItemHeaderPressedCloseButtonForeground" ResourceKey="TextFillColorPrimaryBrush" />
<m:StaticResource x:Key="TabViewItemHeaderPointerOverCloseButtonForeground" ResourceKey="TextFillColorPrimaryBrush" />
<m:StaticResource x:Key="TabViewItemHeaderSelectedCloseButtonForeground" ResourceKey="TextFillColorPrimaryBrush" />
<m:StaticResource x:Key="TabViewItemHeaderDisabledCloseButtonForeground" ResourceKey="TextFillColorDisabledBrush" />

<!-- Resources for Thumb -->
Expand Down

0 comments on commit 449496f

Please sign in to comment.