|
6 | 6 |
|
7 | 7 | <ResourceDictionary.ThemeDictionaries> |
8 | 8 | <ResourceDictionary x:Key="Light"> |
9 | | - <StaticResource x:Key="TabViewBackground" ResourceKey="SubtleFillColorSecondaryBrush" /> |
| 9 | + <StaticResource x:Key="TabViewBackground" ResourceKey="SolidBackgroundFillColorBaseBrush" /> |
10 | 10 | <StaticResource x:Key="TabViewItemHeaderBackground" ResourceKey="SubtleFillColorTransparentBrush" /> |
11 | | - <StaticResource x:Key="TabViewItemHeaderBackgroundSelected" ResourceKey="ControlFillColorInputActiveBrush" /> |
12 | | - <StaticResource x:Key="TabViewItemHeaderBackgroundPointerOver" ResourceKey="SystemAltMediumLowColor" /> |
13 | | - <StaticResource x:Key="TabViewItemHeaderBackgroundPressed" ResourceKey="SystemAltMediumColor" /> |
| 11 | + <StaticResource x:Key="TabViewItemHeaderBackgroundSelected" ResourceKey="SolidBackgroundFillColorQuarternary" /> |
| 12 | + <StaticResource x:Key="TabViewItemHeaderBackgroundPointerOver" ResourceKey="SubtleFillColorSecondaryBrush" /> |
| 13 | + <StaticResource x:Key="TabViewItemHeaderBackgroundPressed" ResourceKey="SubtleFillColorTertiaryBrush" /> |
14 | 14 | <StaticResource x:Key="TabViewItemHeaderBackgroundDisabled" ResourceKey="SubtleFillColorTransparentBrush" /> |
15 | | - <StaticResource x:Key="TabViewItemHeaderForeground" ResourceKey="TextFillColorPrimaryBrush" /> |
16 | | - <StaticResource x:Key="TabViewItemHeaderForegroundPressed" ResourceKey="TextFillColorPrimaryBrush" /> |
| 15 | + <StaticResource x:Key="TabViewItemHeaderForeground" ResourceKey="TextFillColorSecondaryBrush" /> |
| 16 | + <StaticResource x:Key="TabViewItemHeaderForegroundPressed" ResourceKey="TextFillColorTertiaryBrush" /> |
17 | 17 | <StaticResource x:Key="TabViewItemHeaderForegroundSelected" ResourceKey="TextFillColorPrimaryBrush" /> |
18 | | - <StaticResource x:Key="TabViewItemHeaderForegroundPointerOver" ResourceKey="TextFillColorPrimaryBrush" /> |
| 18 | + <StaticResource x:Key="TabViewItemHeaderForegroundPointerOver" ResourceKey="TextFillColorSecondaryBrush" /> |
19 | 19 | <StaticResource x:Key="TabViewItemHeaderForegroundDisabled" ResourceKey="TextFillColorDisabledBrush" /> |
20 | 20 | <StaticResource x:Key="TabViewItemIconForeground" ResourceKey="TextFillColorSecondaryBrush" /> |
21 | | - <StaticResource x:Key="TabViewItemIconForegroundPressed" ResourceKey="TextFillColorSecondaryBrush" /> |
| 21 | + <StaticResource x:Key="TabViewItemIconForegroundPressed" ResourceKey="TextFillColorTertiaryBrush" /> |
22 | 22 | <StaticResource x:Key="TabViewItemIconForegroundSelected" ResourceKey="TextFillColorPrimaryBrush" /> |
23 | 23 | <StaticResource x:Key="TabViewItemIconForegroundPointerOver" ResourceKey="TextFillColorSecondaryBrush" /> |
24 | 24 | <StaticResource x:Key="TabViewItemIconForegroundDisabled" ResourceKey="TextFillColorDisabledBrush" /> |
25 | 25 | <StaticResource x:Key="TabViewButtonBackground" ResourceKey="SubtleFillColorTransparentBrush" /> |
26 | | - <StaticResource x:Key="TabViewButtonBackgroundPressed" ResourceKey="SystemAltMediumColor" /> |
27 | | - <StaticResource x:Key="TabViewButtonBackgroundPointerOver" ResourceKey="SystemAltMediumLowColor" /> |
| 26 | + <StaticResource x:Key="TabViewButtonBackgroundPressed" ResourceKey="SubtleFillColorTertiaryBrush" /> |
| 27 | + <StaticResource x:Key="TabViewButtonBackgroundPointerOver" ResourceKey="SubtleFillColorSecondaryBrush" /> |
28 | 28 | <StaticResource x:Key="TabViewButtonBackgroundDisabled" ResourceKey="SubtleFillColorTransparentBrush" /> |
29 | | - <StaticResource x:Key="TabViewButtonForeground" ResourceKey="ControlStrongFillColorDefaultBrush" /> |
30 | | - <StaticResource x:Key="TabViewButtonForegroundPressed" ResourceKey="TextFillColorPrimaryBrush" /> |
| 29 | + <StaticResource x:Key="TabViewButtonForeground" ResourceKey="TextFillColorPrimaryBrush" /> |
| 30 | + <StaticResource x:Key="TabViewButtonForegroundPressed" ResourceKey="TextFillColorSecondaryBrush" /> |
31 | 31 | <StaticResource x:Key="TabViewButtonForegroundPointerOver" ResourceKey="TextFillColorPrimaryBrush" /> |
32 | 32 | <StaticResource x:Key="TabViewButtonForegroundDisabled" ResourceKey="TextFillColorDisabledBrush" /> |
33 | 33 | <StaticResource x:Key="TabViewScrollButtonBackground" ResourceKey="SubtleFillColorTransparentBrush" /> |
|
39 | 39 | <StaticResource x:Key="TabViewItemHeaderPointerOverCloseButtonBackground" ResourceKey="SubtleFillColorTransparentBrush" /> |
40 | 40 | <StaticResource x:Key="TabViewItemHeaderSelectedCloseButtonBackground" ResourceKey="SubtleFillColorTransparentBrush" /> |
41 | 41 | <StaticResource x:Key="TabViewItemHeaderDisabledCloseButtonBackground" ResourceKey="SubtleFillColorTransparentBrush" /> |
42 | | - <StaticResource x:Key="TabViewItemHeaderCloseButtonForeground" ResourceKey="ControlStrongFillColorDefaultBrush" /> |
| 42 | + <StaticResource x:Key="TabViewItemHeaderCloseButtonForeground" ResourceKey="TextFillColorPrimaryBrush" /> |
43 | 43 | <StaticResource x:Key="TabViewItemHeaderCloseButtonForegroundPressed" ResourceKey="TextFillColorSecondaryBrush" /> |
44 | | - <StaticResource x:Key="TabViewItemHeaderCloseButtonForegroundPointerOver" ResourceKey="TextFillColorSecondaryBrush" /> |
45 | | - <StaticResource x:Key="TabViewItemHeaderPressedCloseButtonForeground" ResourceKey="ControlStrongFillColorDefaultBrush" /> |
46 | | - <StaticResource x:Key="TabViewItemHeaderPointerOverCloseButtonForeground" ResourceKey="ControlStrongFillColorDefaultBrush" /> |
47 | | - <StaticResource x:Key="TabViewItemHeaderSelectedCloseButtonForeground" ResourceKey="ControlStrongFillColorDefaultBrush" /> |
| 44 | + <StaticResource x:Key="TabViewItemHeaderCloseButtonForegroundPointerOver" ResourceKey="TextFillColorPrimaryBrush" /> |
| 45 | + <StaticResource x:Key="TabViewItemHeaderPressedCloseButtonForeground" ResourceKey="TextFillColorPrimaryBrush" /> |
| 46 | + <StaticResource x:Key="TabViewItemHeaderPointerOverCloseButtonForeground" ResourceKey="TextFillColorPrimaryBrush" /> |
| 47 | + <StaticResource x:Key="TabViewItemHeaderSelectedCloseButtonForeground" ResourceKey="TextFillColorPrimaryBrush" /> |
48 | 48 | <StaticResource x:Key="TabViewItemHeaderDisabledCloseButtonForeground" ResourceKey="TextFillColorDisabledBrush" /> |
49 | 49 |
|
50 | 50 | <!-- Note: These theme resources below are no longer used and might be removed in a future WinUI update. --> |
|
53 | 53 | </ResourceDictionary> |
54 | 54 |
|
55 | 55 | <ResourceDictionary x:Key="Dark"> |
56 | | - <StaticResource x:Key="TabViewBackground" ResourceKey="ControlFillColorTertiaryBrush" /> |
| 56 | + <StaticResource x:Key="TabViewBackground" ResourceKey="SolidBackgroundFillColorBaseBrush" /> |
57 | 57 | <StaticResource x:Key="TabViewItemHeaderBackground" ResourceKey="SubtleFillColorTransparentBrush" /> |
58 | | - <StaticResource x:Key="TabViewItemHeaderBackgroundSelected" ResourceKey="ControlFillColorInputActiveBrush" /> |
59 | | - <StaticResource x:Key="TabViewItemHeaderBackgroundPointerOver" ResourceKey="SystemAltMediumLowColor" /> |
60 | | - <StaticResource x:Key="TabViewItemHeaderBackgroundPressed" ResourceKey="SystemAltMediumColor" /> |
| 58 | + <StaticResource x:Key="TabViewItemHeaderBackgroundSelected" ResourceKey="SolidBackgroundFillColorQuarternary" /> |
| 59 | + <StaticResource x:Key="TabViewItemHeaderBackgroundPointerOver" ResourceKey="SubtleFillColorSecondaryBrush" /> |
| 60 | + <StaticResource x:Key="TabViewItemHeaderBackgroundPressed" ResourceKey="SubtleFillColorTertiaryBrush" /> |
61 | 61 | <StaticResource x:Key="TabViewItemHeaderBackgroundDisabled" ResourceKey="SubtleFillColorTransparentBrush" /> |
62 | | - <StaticResource x:Key="TabViewItemHeaderForeground" ResourceKey="TextFillColorPrimaryBrush" /> |
63 | | - <StaticResource x:Key="TabViewItemHeaderForegroundPressed" ResourceKey="TextFillColorPrimaryBrush" /> |
| 62 | + <StaticResource x:Key="TabViewItemHeaderForeground" ResourceKey="TextFillColorSecondaryBrush" /> |
| 63 | + <StaticResource x:Key="TabViewItemHeaderForegroundPressed" ResourceKey="TextFillColorTertiaryBrush" /> |
64 | 64 | <StaticResource x:Key="TabViewItemHeaderForegroundSelected" ResourceKey="TextFillColorPrimaryBrush" /> |
65 | | - <StaticResource x:Key="TabViewItemHeaderForegroundPointerOver" ResourceKey="TextFillColorPrimaryBrush" /> |
| 65 | + <StaticResource x:Key="TabViewItemHeaderForegroundPointerOver" ResourceKey="TextFillColorSecondaryBrush" /> |
66 | 66 | <StaticResource x:Key="TabViewItemHeaderForegroundDisabled" ResourceKey="TextFillColorDisabledBrush" /> |
67 | 67 | <StaticResource x:Key="TabViewItemIconForeground" ResourceKey="TextFillColorSecondaryBrush" /> |
68 | | - <StaticResource x:Key="TabViewItemIconForegroundPressed" ResourceKey="TextFillColorSecondaryBrush" /> |
| 68 | + <StaticResource x:Key="TabViewItemIconForegroundPressed" ResourceKey="TextFillColorTertiaryBrush" /> |
69 | 69 | <StaticResource x:Key="TabViewItemIconForegroundSelected" ResourceKey="TextFillColorPrimaryBrush" /> |
70 | 70 | <StaticResource x:Key="TabViewItemIconForegroundPointerOver" ResourceKey="TextFillColorSecondaryBrush" /> |
71 | 71 | <StaticResource x:Key="TabViewItemIconForegroundDisabled" ResourceKey="TextFillColorDisabledBrush" /> |
72 | 72 | <StaticResource x:Key="TabViewButtonBackground" ResourceKey="SubtleFillColorTransparentBrush" /> |
73 | | - <StaticResource x:Key="TabViewButtonBackgroundPressed" ResourceKey="SystemAltMediumColor" /> |
74 | | - <StaticResource x:Key="TabViewButtonBackgroundPointerOver" ResourceKey="SystemAltMediumLowColor" /> |
| 73 | + <StaticResource x:Key="TabViewButtonBackgroundPressed" ResourceKey="SubtleFillColorTertiaryBrush" /> |
| 74 | + <StaticResource x:Key="TabViewButtonBackgroundPointerOver" ResourceKey="SubtleFillColorSecondaryBrush" /> |
75 | 75 | <StaticResource x:Key="TabViewButtonBackgroundDisabled" ResourceKey="SubtleFillColorTransparentBrush" /> |
76 | | - <StaticResource x:Key="TabViewButtonForeground" ResourceKey="ControlStrongFillColorDefaultBrush" /> |
77 | | - <StaticResource x:Key="TabViewButtonForegroundPressed" ResourceKey="TextFillColorPrimaryBrush" /> |
| 76 | + <StaticResource x:Key="TabViewButtonForeground" ResourceKey="TextFillColorPrimaryBrush" /> |
| 77 | + <StaticResource x:Key="TabViewButtonForegroundPressed" ResourceKey="TextFillColorSecondaryBrush" /> |
78 | 78 | <StaticResource x:Key="TabViewButtonForegroundPointerOver" ResourceKey="TextFillColorPrimaryBrush" /> |
79 | 79 | <StaticResource x:Key="TabViewButtonForegroundDisabled" ResourceKey="TextFillColorDisabledBrush" /> |
80 | 80 | <StaticResource x:Key="TabViewScrollButtonBackground" ResourceKey="SubtleFillColorTransparentBrush" /> |
|
85 | 85 | <StaticResource x:Key="TabViewItemHeaderPressedCloseButtonBackground" ResourceKey="SubtleFillColorTransparentBrush" /> |
86 | 86 | <StaticResource x:Key="TabViewItemHeaderPointerOverCloseButtonBackground" ResourceKey="SubtleFillColorTransparentBrush" /> |
87 | 87 | <StaticResource x:Key="TabViewItemHeaderSelectedCloseButtonBackground" ResourceKey="SubtleFillColorTransparentBrush" /> |
88 | | - <StaticResource x:Key="TabViewItemHeaderDisabledCloseButtonBackground" ResourceKey="SubtleFillColorTransparentBrush" /> |
89 | | - <StaticResource x:Key="TabViewItemHeaderCloseButtonForeground" ResourceKey="ControlStrongFillColorDefaultBrush" /> |
| 88 | + <StaticResource x:Key="TabViewItemHeaderDisabledCloseButtonBackground" ResourceKey="SubtleFillColorTransparentBrush" /> |
| 89 | + <StaticResource x:Key="TabViewItemHeaderCloseButtonForeground" ResourceKey="TextFillColorPrimaryBrush" /> |
90 | 90 | <StaticResource x:Key="TabViewItemHeaderCloseButtonForegroundPressed" ResourceKey="TextFillColorSecondaryBrush" /> |
91 | | - <StaticResource x:Key="TabViewItemHeaderCloseButtonForegroundPointerOver" ResourceKey="TextFillColorSecondaryBrush" /> |
92 | | - <StaticResource x:Key="TabViewItemHeaderPressedCloseButtonForeground" ResourceKey="ControlStrongFillColorDefaultBrush" /> |
93 | | - <StaticResource x:Key="TabViewItemHeaderPointerOverCloseButtonForeground" ResourceKey="ControlStrongFillColorDefaultBrush" /> |
94 | | - <StaticResource x:Key="TabViewItemHeaderSelectedCloseButtonForeground" ResourceKey="ControlStrongFillColorDefaultBrush" /> |
| 91 | + <StaticResource x:Key="TabViewItemHeaderCloseButtonForegroundPointerOver" ResourceKey="TextFillColorPrimaryBrush" /> |
| 92 | + <StaticResource x:Key="TabViewItemHeaderPressedCloseButtonForeground" ResourceKey="TextFillColorPrimaryBrush" /> |
| 93 | + <StaticResource x:Key="TabViewItemHeaderPointerOverCloseButtonForeground" ResourceKey="TextFillColorPrimaryBrush" /> |
| 94 | + <StaticResource x:Key="TabViewItemHeaderSelectedCloseButtonForeground" ResourceKey="TextFillColorPrimaryBrush" /> |
95 | 95 | <StaticResource x:Key="TabViewItemHeaderDisabledCloseButtonForeground" ResourceKey="TextFillColorDisabledBrush" /> |
96 | 96 |
|
97 | 97 | <!-- Note: These theme resources below are no longer used and might be removed in a future WinUI update. --> |
|
0 commit comments