Skip to content

Commit c64dc61

Browse files
himgoyalmicrohimgoyalmicro
authored
Making resources in parity with WinUI (#9151)
1 parent 7c0d993 commit c64dc61

File tree

7 files changed

+131
-21
lines changed

7 files changed

+131
-21
lines changed

‎src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Resources/Accent.xaml‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -25,23 +25,6 @@
2525
<SolidColorBrush x:Key="SystemAccentColorSecondaryBrush" Color="{StaticResource SystemAccentColorSecondary}" />
2626
<SolidColorBrush x:Key="SystemAccentColorTertiaryBrush" Color="{StaticResource SystemAccentColorTertiary}" />
2727

28-
<SolidColorBrush x:Key="AccentTextFillColorPrimaryBrush" Color="{StaticResource SystemAccentColorSecondary}" />
29-
<SolidColorBrush x:Key="AccentTextFillColorSecondaryBrush" Color="{StaticResource SystemAccentColorTertiary}" />
30-
<SolidColorBrush x:Key="AccentTextFillColorTertiaryBrush" Color="{StaticResource SystemAccentColorPrimary}" />
31-
32-
<SolidColorBrush x:Key="AccentFillColorSelectedTextBackgroundBrush" Color="{StaticResource SystemAccentColor}" />
33-
34-
<SolidColorBrush x:Key="AccentFillColorDefaultBrush" Color="{StaticResource SystemAccentColorPrimary}" />
35-
<SolidColorBrush
36-
x:Key="AccentFillColorSecondaryBrush"
37-
Opacity="0.9"
38-
Color="{StaticResource SystemAccentColorPrimary}" />
39-
<SolidColorBrush
40-
x:Key="AccentFillColorTertiaryBrush"
41-
Opacity="0.8"
42-
Color="{StaticResource SystemAccentColorPrimary}" />
4328
<SolidColorBrush x:Key="AccentFillColorDisabledBrush" Color="{StaticResource AccentFillColorDisabled}" />
4429

45-
46-
<SolidColorBrush x:Key="SystemFillColorAttentionBrush" Color="{StaticResource SystemAccentColor}" />
4730
</ResourceDictionary>

‎src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Resources/Theme/Dark.xaml‎

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<Color x:Key="TextOnAccentFillColorSelectedText">#FFFFFF</Color>
3636
<Color x:Key="TextOnAccentFillColorPrimary">#000000</Color>
3737
<Color x:Key="TextOnAccentFillColorSecondary">#80000000</Color>
38-
<Color x:Key="TextOnAccentFillColorDisabled">#77000000</Color>
38+
<Color x:Key="TextOnAccentFillColorDisabled">#87FFFFFF</Color>
3939

4040
<Color x:Key="ControlFillColorDefault">#0FFFFFFF</Color>
4141
<Color x:Key="ControlFillColorSecondary">#15FFFFFF</Color>
@@ -57,7 +57,7 @@
5757

5858
<Color x:Key="ControlAltFillColorTransparent">#00FFFFFF</Color>
5959
<Color x:Key="ControlAltFillColorSecondary">#19000000</Color>
60-
<Color x:Key="ControlAltFillColorTertiary">#FF373737</Color>
60+
<Color x:Key="ControlAltFillColorTertiary">#0BFFFFFF</Color>
6161
<Color x:Key="ControlAltFillColorQuarternary">#12FFFFFF</Color>
6262
<Color x:Key="ControlAltFillColorDisabled">#00FFFFFF</Color>
6363

@@ -237,6 +237,33 @@
237237
<SolidColorBrush x:Key="SystemFillColorSolidAttentionBackgroundBrush" Color="{StaticResource SystemFillColorSolidAttentionBackground}" />
238238
<SolidColorBrush x:Key="SystemFillColorSolidNeutralBackgroundBrush" Color="{StaticResource SystemFillColorSolidNeutralBackground}" />
239239

240+
<SolidColorBrush x:Key="AccentTextFillColorPrimaryBrush" Color="{StaticResource SystemAccentColorTertiary}" />
241+
<SolidColorBrush x:Key="AccentTextFillColorSecondaryBrush" Color="{StaticResource SystemAccentColorTertiary}" />
242+
<SolidColorBrush x:Key="AccentTextFillColorTertiaryBrush" Color="{StaticResource SystemAccentColorSecondary}" />
243+
244+
<SolidColorBrush x:Key="AccentFillColorSelectedTextBackgroundBrush" Color="{StaticResource SystemAccentColor}" />
245+
246+
<SolidColorBrush x:Key="AccentFillColorDefaultBrush" Color="{StaticResource SystemAccentColorSecondary}" />
247+
<SolidColorBrush
248+
x:Key="AccentFillColorSecondaryBrush"
249+
Opacity="0.9"
250+
Color="{StaticResource SystemAccentColorSecondary}" />
251+
<SolidColorBrush
252+
x:Key="AccentFillColorTertiaryBrush"
253+
Opacity="0.8"
254+
Color="{StaticResource SystemAccentColorSecondary}" />
255+
256+
<SolidColorBrush x:Key="SystemFillColorAttentionBrush" Color="{StaticResource SystemAccentColorSecondary}" />
257+
258+
<SolidColorBrush x:Key="SystemColorWindowTextColorBrush" Color="#FF00FF"/>
259+
<SolidColorBrush x:Key="SystemColorWindowColorBrush" Color="#FF00FF"/>
260+
<SolidColorBrush x:Key="SystemColorButtonFaceColorBrush" Color="#FF00FF"/>
261+
<SolidColorBrush x:Key="SystemColorButtonTextColorBrush" Color="#FF00FF"/>
262+
<SolidColorBrush x:Key="SystemColorHighlightColorBrush" Color="#FF00FF"/>
263+
<SolidColorBrush x:Key="SystemColorHighlightTextColorBrush" Color="#FF00FF"/>
264+
<SolidColorBrush x:Key="SystemColorHotlightColorBrush" Color="#FF00FF"/>
265+
<SolidColorBrush x:Key="SystemColorGrayTextColorBrush" Color="#FF00FF"/>
266+
240267
<!-- Elevation border brushes -->
241268

242269
<LinearGradientBrush x:Key="ControlElevationBorderBrush" MappingMode="Absolute" StartPoint="0,0" EndPoint="0,3">

‎src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Resources/Theme/HC1.xaml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,24 @@
146146
<SolidColorBrush x:Key="SystemFillColorSolidAttentionBackgroundBrush" Color="{StaticResource SystemFillColorSolidAttentionBackground}" />
147147
<SolidColorBrush x:Key="SystemFillColorSolidNeutralBackgroundBrush" Color="{StaticResource SystemFillColorSolidNeutralBackground}" />
148148

149+
<SolidColorBrush x:Key="AccentTextFillColorPrimaryBrush" Color="{StaticResource SystemAccentColorSecondary}" />
150+
<SolidColorBrush x:Key="AccentTextFillColorSecondaryBrush" Color="{StaticResource SystemAccentColorTertiary}" />
151+
<SolidColorBrush x:Key="AccentTextFillColorTertiaryBrush" Color="{StaticResource SystemAccentColorPrimary}" />
152+
153+
<SolidColorBrush x:Key="AccentFillColorSelectedTextBackgroundBrush" Color="{StaticResource SystemAccentColor}" />
154+
155+
<SolidColorBrush x:Key="AccentFillColorDefaultBrush" Color="{StaticResource SystemAccentColorPrimary}" />
156+
<SolidColorBrush
157+
x:Key="AccentFillColorSecondaryBrush"
158+
Opacity="0.9"
159+
Color="{StaticResource SystemAccentColorPrimary}" />
160+
<SolidColorBrush
161+
x:Key="AccentFillColorTertiaryBrush"
162+
Opacity="0.8"
163+
Color="{StaticResource SystemAccentColorPrimary}" />
164+
165+
<SolidColorBrush x:Key="SystemFillColorAttentionBrush" Color="{StaticResource SystemAccentColor}" />
166+
149167
<!-- Elevation border brushes -->
150168

151169
<SolidColorBrush x:Key="ControlElevationBorderBrush" Color="{StaticResource SystemColorWindowTextColor}" />

‎src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Resources/Theme/HC2.xaml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,24 @@
145145
<SolidColorBrush x:Key="SystemFillColorSolidAttentionBackgroundBrush" Color="{StaticResource SystemFillColorSolidAttentionBackground}" />
146146
<SolidColorBrush x:Key="SystemFillColorSolidNeutralBackgroundBrush" Color="{StaticResource SystemFillColorSolidNeutralBackground}" />
147147

148+
<SolidColorBrush x:Key="AccentTextFillColorPrimaryBrush" Color="{StaticResource SystemAccentColorSecondary}" />
149+
<SolidColorBrush x:Key="AccentTextFillColorSecondaryBrush" Color="{StaticResource SystemAccentColorTertiary}" />
150+
<SolidColorBrush x:Key="AccentTextFillColorTertiaryBrush" Color="{StaticResource SystemAccentColorPrimary}" />
151+
152+
<SolidColorBrush x:Key="AccentFillColorSelectedTextBackgroundBrush" Color="{StaticResource SystemAccentColor}" />
153+
154+
<SolidColorBrush x:Key="AccentFillColorDefaultBrush" Color="{StaticResource SystemAccentColorPrimary}" />
155+
<SolidColorBrush
156+
x:Key="AccentFillColorSecondaryBrush"
157+
Opacity="0.9"
158+
Color="{StaticResource SystemAccentColorPrimary}" />
159+
<SolidColorBrush
160+
x:Key="AccentFillColorTertiaryBrush"
161+
Opacity="0.8"
162+
Color="{StaticResource SystemAccentColorPrimary}" />
163+
164+
<SolidColorBrush x:Key="SystemFillColorAttentionBrush" Color="{StaticResource SystemAccentColor}" />
165+
148166
<!-- Elevation border brushes -->
149167

150168
<SolidColorBrush x:Key="ControlElevationBorderBrush" Color="{StaticResource SystemColorWindowTextColor}" />

‎src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Resources/Theme/HCBlack.xaml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,24 @@
145145
<SolidColorBrush x:Key="SystemFillColorSolidAttentionBackgroundBrush" Color="{StaticResource SystemFillColorSolidAttentionBackground}" />
146146
<SolidColorBrush x:Key="SystemFillColorSolidNeutralBackgroundBrush" Color="{StaticResource SystemFillColorSolidNeutralBackground}" />
147147

148+
<SolidColorBrush x:Key="AccentTextFillColorPrimaryBrush" Color="{StaticResource SystemAccentColorSecondary}" />
149+
<SolidColorBrush x:Key="AccentTextFillColorSecondaryBrush" Color="{StaticResource SystemAccentColorTertiary}" />
150+
<SolidColorBrush x:Key="AccentTextFillColorTertiaryBrush" Color="{StaticResource SystemAccentColorPrimary}" />
151+
152+
<SolidColorBrush x:Key="AccentFillColorSelectedTextBackgroundBrush" Color="{StaticResource SystemAccentColor}" />
153+
154+
<SolidColorBrush x:Key="AccentFillColorDefaultBrush" Color="{StaticResource SystemAccentColorPrimary}" />
155+
<SolidColorBrush
156+
x:Key="AccentFillColorSecondaryBrush"
157+
Opacity="0.9"
158+
Color="{StaticResource SystemAccentColorPrimary}" />
159+
<SolidColorBrush
160+
x:Key="AccentFillColorTertiaryBrush"
161+
Opacity="0.8"
162+
Color="{StaticResource SystemAccentColorPrimary}" />
163+
164+
<SolidColorBrush x:Key="SystemFillColorAttentionBrush" Color="{StaticResource SystemAccentColor}" />
165+
148166
<!-- Elevation border brushes -->
149167

150168
<SolidColorBrush x:Key="ControlElevationBorderBrush" Color="{StaticResource SystemColorWindowTextColor}" />

‎src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Resources/Theme/HCWhite.xaml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,24 @@
145145
<SolidColorBrush x:Key="SystemFillColorSolidAttentionBackgroundBrush" Color="{StaticResource SystemFillColorSolidAttentionBackground}" />
146146
<SolidColorBrush x:Key="SystemFillColorSolidNeutralBackgroundBrush" Color="{StaticResource SystemFillColorSolidNeutralBackground}" />
147147

148+
<SolidColorBrush x:Key="AccentTextFillColorPrimaryBrush" Color="{StaticResource SystemAccentColorSecondary}" />
149+
<SolidColorBrush x:Key="AccentTextFillColorSecondaryBrush" Color="{StaticResource SystemAccentColorTertiary}" />
150+
<SolidColorBrush x:Key="AccentTextFillColorTertiaryBrush" Color="{StaticResource SystemAccentColorPrimary}" />
151+
152+
<SolidColorBrush x:Key="AccentFillColorSelectedTextBackgroundBrush" Color="{StaticResource SystemAccentColor}" />
153+
154+
<SolidColorBrush x:Key="AccentFillColorDefaultBrush" Color="{StaticResource SystemAccentColorPrimary}" />
155+
<SolidColorBrush
156+
x:Key="AccentFillColorSecondaryBrush"
157+
Opacity="0.9"
158+
Color="{StaticResource SystemAccentColorPrimary}" />
159+
<SolidColorBrush
160+
x:Key="AccentFillColorTertiaryBrush"
161+
Opacity="0.8"
162+
Color="{StaticResource SystemAccentColorPrimary}" />
163+
164+
<SolidColorBrush x:Key="SystemFillColorAttentionBrush" Color="{StaticResource SystemAccentColor}" />
165+
148166
<!-- Elevation border brushes -->
149167

150168
<SolidColorBrush x:Key="ControlElevationBorderBrush" Color="{StaticResource SystemColorWindowTextColor}" />

‎src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Resources/Theme/Light.xaml‎

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<Color x:Key="TextOnAccentFillColorSelectedText">#FFFFFF</Color>
3636
<Color x:Key="TextOnAccentFillColorPrimary">#FFFFFF</Color>
3737
<Color x:Key="TextOnAccentFillColorSecondary">#B3FFFFFF</Color>
38-
<Color x:Key="TextOnAccentFillColorDisabled">#A3FFFFFF</Color>
38+
<Color x:Key="TextOnAccentFillColorDisabled">#FFFFFF</Color>
3939

4040
<Color x:Key="ControlFillColorDefault">#B3FFFFFF</Color>
4141
<Color x:Key="ControlFillColorSecondary">#80F9F9F9</Color>
@@ -57,7 +57,7 @@
5757

5858
<Color x:Key="ControlAltFillColorTransparent">#00FFFFFF</Color>
5959
<Color x:Key="ControlAltFillColorSecondary">#06000000</Color>
60-
<Color x:Key="ControlAltFillColorTertiary">#FFE9E9E9</Color>
60+
<Color x:Key="ControlAltFillColorTertiary">#0F000000</Color>
6161
<Color x:Key="ControlAltFillColorQuarternary">#18000000</Color>
6262
<Color x:Key="ControlAltFillColorDisabled">#00FFFFFF</Color>
6363

@@ -237,6 +237,34 @@
237237
<SolidColorBrush x:Key="SystemFillColorSolidAttentionBackgroundBrush" Color="{StaticResource SystemFillColorSolidAttentionBackground}" />
238238
<SolidColorBrush x:Key="SystemFillColorSolidNeutralBackgroundBrush" Color="{StaticResource SystemFillColorSolidNeutralBackground}" />
239239

240+
<SolidColorBrush x:Key="AccentTextFillColorPrimaryBrush" Color="{StaticResource SystemAccentColorSecondary}" />
241+
<SolidColorBrush x:Key="AccentTextFillColorSecondaryBrush" Color="{StaticResource SystemAccentColorTertiary}" />
242+
<SolidColorBrush x:Key="AccentTextFillColorTertiaryBrush" Color="{StaticResource SystemAccentColorPrimary}" />
243+
244+
<SolidColorBrush x:Key="AccentFillColorSelectedTextBackgroundBrush" Color="{StaticResource SystemAccentColor}" />
245+
246+
<SolidColorBrush x:Key="AccentFillColorDefaultBrush" Color="{StaticResource SystemAccentColorPrimary}" />
247+
<SolidColorBrush
248+
x:Key="AccentFillColorSecondaryBrush"
249+
Opacity="0.9"
250+
Color="{StaticResource SystemAccentColorPrimary}" />
251+
<SolidColorBrush
252+
x:Key="AccentFillColorTertiaryBrush"
253+
Opacity="0.8"
254+
Color="{StaticResource SystemAccentColorPrimary}" />
255+
256+
<SolidColorBrush x:Key="SystemFillColorAttentionBrush" Color="{StaticResource SystemAccentColor}" />
257+
258+
<SolidColorBrush x:Key="SystemColorWindowTextColorBrush" Color="#FF00FF"/>
259+
<SolidColorBrush x:Key="SystemColorWindowColorBrush" Color="#FF00FF"/>
260+
<SolidColorBrush x:Key="SystemColorButtonFaceColorBrush" Color="#FF00FF"/>
261+
<SolidColorBrush x:Key="SystemColorButtonTextColorBrush" Color="#FF00FF"/>
262+
<SolidColorBrush x:Key="SystemColorHighlightColorBrush" Color="#FF00FF"/>
263+
<SolidColorBrush x:Key="SystemColorHighlightTextColorBrush" Color="#FF00FF"/>
264+
<SolidColorBrush x:Key="SystemColorHotlightColorBrush" Color="#FF00FF"/>
265+
<SolidColorBrush x:Key="SystemColorGrayTextColorBrush" Color="#FF00FF"/>
266+
267+
240268
<!-- Elevation border brushes -->
241269

242270
<LinearGradientBrush x:Key="ControlElevationBorderBrush" MappingMode="RelativeToBoundingBox" StartPoint="0,1" EndPoint="0,0">

0 commit comments

Comments
 (0)