Skip to content

Commit 8529feb

Browse files
himgoyalmicrohimgoyalmicro
authored
Making common resource in parity with WinUI (#9421)
* Making common resource in parity with WinUI * Added some system color keys to light.xaml and dark.xaml
1 parent 15e362e commit 8529feb

File tree

3 files changed

+42
-137
lines changed

3 files changed

+42
-137
lines changed

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

Lines changed: 20 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,13 @@
2828
<Color x:Key="TextFillColorSecondary">#C5FFFFFF</Color>
2929
<Color x:Key="TextFillColorTertiary">#87FFFFFF</Color>
3030
<Color x:Key="TextFillColorDisabled">#5DFFFFFF</Color>
31-
<Color x:Key="TextPlaceholderColor">#87FFFFFF</Color>
3231
<Color x:Key="TextFillColorInverse">#E4000000</Color>
3332

3433
<Color x:Key="AccentTextFillColorDisabled">#5DFFFFFF</Color>
3534
<Color x:Key="TextOnAccentFillColorSelectedText">#FFFFFF</Color>
3635
<Color x:Key="TextOnAccentFillColorPrimary">#000000</Color>
3736
<Color x:Key="TextOnAccentFillColorSecondary">#80000000</Color>
38-
<Color x:Key="TextOnAccentFillColorDisabled">#77000000</Color>
37+
<Color x:Key="TextOnAccentFillColorDisabled">#87FFFFFF</Color>
3938

4039
<Color x:Key="ControlFillColorDefault">#0FFFFFFF</Color>
4140
<Color x:Key="ControlFillColorSecondary">#15FFFFFF</Color>
@@ -53,11 +52,10 @@
5352
<Color x:Key="SubtleFillColorSecondary">#0FFFFFFF</Color>
5453
<Color x:Key="SubtleFillColorTertiary">#0AFFFFFF</Color>
5554
<Color x:Key="SubtleFillColorDisabled">#00FFFFFF</Color>
56-
<Color x:Key="SubtleBorderBrushTertiary">#4A4A4A</Color>
5755

5856
<Color x:Key="ControlAltFillColorTransparent">#00FFFFFF</Color>
5957
<Color x:Key="ControlAltFillColorSecondary">#19000000</Color>
60-
<Color x:Key="ControlAltFillColorTertiary">#FF373737</Color>
58+
<Color x:Key="ControlAltFillColorTertiary">#0BFFFFFF</Color>
6159
<Color x:Key="ControlAltFillColorQuarternary">#12FFFFFF</Color>
6260
<Color x:Key="ControlAltFillColorDisabled">#00FFFFFF</Color>
6361

@@ -70,7 +68,6 @@
7068

7169
<Color x:Key="ControlStrokeColorDefault">#12FFFFFF</Color>
7270
<Color x:Key="ControlStrokeColorSecondary">#18FFFFFF</Color>
73-
<Color x:Key="ControlStrokeColorTertiary">#C5FFFFFF</Color>
7471
<Color x:Key="ControlStrokeColorOnAccentDefault">#14FFFFFF</Color>
7572
<Color x:Key="ControlStrokeColorOnAccentSecondary">#23000000</Color>
7673
<Color x:Key="ControlStrokeColorOnAccentTertiary">#37000000</Color>
@@ -131,13 +128,21 @@
131128
<Color x:Key="SystemFillColorSolidAttentionBackground">#2E2E2E</Color>
132129
<Color x:Key="SystemFillColorSolidNeutralBackground">#2E2E2E</Color>
133130

131+
<Color x:Key="SystemColorWindowTextColor">#FF00FF</Color>
132+
<Color x:Key="SystemColorWindowColor">#FF00FF</Color>
133+
<Color x:Key="SystemColorButtonFaceColor">#FF00FF</Color>
134+
<Color x:Key="SystemColorButtonTextColor">#FF00FF</Color>
135+
<Color x:Key="SystemColorHighlightColor">#FF00FF</Color>
136+
<Color x:Key="SystemColorHighlightTextColor">#FF00FF</Color>
137+
<Color x:Key="SystemColorHotlightColor">#FF00FF</Color>
138+
<Color x:Key="SystemColorGrayTextColor">#FF00FF</Color>
139+
134140
<!-- Brushes -->
135141

136142
<SolidColorBrush x:Key="TextFillColorPrimaryBrush" Color="{StaticResource TextFillColorPrimary}" />
137143
<SolidColorBrush x:Key="TextFillColorSecondaryBrush" Color="{StaticResource TextFillColorSecondary}" />
138144
<SolidColorBrush x:Key="TextFillColorTertiaryBrush" Color="{StaticResource TextFillColorTertiary}" />
139145
<SolidColorBrush x:Key="TextFillColorDisabledBrush" Color="{StaticResource TextFillColorDisabled}" />
140-
<SolidColorBrush x:Key="TextPlaceholderColorBrush" Color="{StaticResource TextPlaceholderColor}" />
141146
<SolidColorBrush x:Key="TextFillColorInverseBrush" Color="{StaticResource TextFillColorInverse}" />
142147

143148
<SolidColorBrush x:Key="AccentTextFillColorDisabledBrush" Color="{StaticResource AccentTextFillColorDisabled}" />
@@ -180,7 +185,6 @@
180185

181186
<SolidColorBrush x:Key="ControlStrokeColorDefaultBrush" Color="{StaticResource ControlStrokeColorDefault}" />
182187
<SolidColorBrush x:Key="ControlStrokeColorSecondaryBrush" Color="{StaticResource ControlStrokeColorSecondary}" />
183-
<SolidColorBrush x:Key="ControlStrokeColorTertiaryBrush" Color="{StaticResource ControlStrokeColorTertiary}" />
184188
<SolidColorBrush x:Key="ControlStrokeColorOnAccentDefaultBrush" Color="{StaticResource ControlStrokeColorOnAccentDefault}" />
185189
<SolidColorBrush x:Key="ControlStrokeColorOnAccentSecondaryBrush" Color="{StaticResource ControlStrokeColorOnAccentSecondary}" />
186190
<SolidColorBrush x:Key="ControlStrokeColorOnAccentTertiaryBrush" Color="{StaticResource ControlStrokeColorOnAccentTertiary}" />
@@ -276,44 +280,14 @@
276280
</LinearGradientBrush.GradientStops>
277281
</LinearGradientBrush>
278282

279-
<DrawingBrush
280-
x:Key="StripedBackgroundBrush"
281-
Stretch="UniformToFill"
282-
TileMode="Tile"
283-
Viewport="0,0,10,10"
284-
ViewportUnits="Absolute">
285-
<DrawingBrush.Drawing>
286-
<DrawingGroup>
287-
<DrawingGroup.Children>
288-
<GeometryDrawing Brush="#0DFFFFFF">
289-
<GeometryDrawing.Geometry>
290-
<GeometryGroup FillRule="Nonzero">
291-
<PathGeometry>
292-
<PathFigure StartPoint="0,0">
293-
<LineSegment Point="25,0" />
294-
<LineSegment Point="100,75" />
295-
<LineSegment Point="100,100" />
296-
<LineSegment Point="75,100" />
297-
<LineSegment Point="0,25" />
298-
<LineSegment Point="0,0" />
299-
</PathFigure>
300-
<PathFigure StartPoint="75,0">
301-
<LineSegment Point="100,25" />
302-
<LineSegment Point="100,0" />
303-
</PathFigure>
304-
<PathFigure StartPoint="0,75">
305-
<LineSegment Point="25,100" />
306-
<LineSegment Point="0,100" />
307-
</PathFigure>
308-
</PathGeometry>
309-
</GeometryGroup>
310-
</GeometryDrawing.Geometry>
311-
</GeometryDrawing>
312-
</DrawingGroup.Children>
313-
</DrawingGroup>
314-
</DrawingBrush.Drawing>
315-
</DrawingBrush>
316-
283+
<SolidColorBrush x:Key="SystemColorWindowTextColorBrush" Color="{StaticResource SystemColorWindowTextColor}" />
284+
<SolidColorBrush x:Key="SystemColorWindowColorBrush" Color="{StaticResource SystemColorWindowColor}" />
285+
<SolidColorBrush x:Key="SystemColorButtonFaceColorBrush" Color="{StaticResource SystemColorButtonFaceColor}" />
286+
<SolidColorBrush x:Key="SystemColorButtonTextColorBrush" Color="{StaticResource SystemColorButtonTextColor}" />
287+
<SolidColorBrush x:Key="SystemColorHighlightColorBrush" Color="{StaticResource SystemColorHighlightColor}" />
288+
<SolidColorBrush x:Key="SystemColorHighlightTextColorBrush" Color="{StaticResource SystemColorHighlightTextColor}" />
289+
<SolidColorBrush x:Key="SystemColorHotlightColorBrush" Color="{StaticResource SystemColorHotlightColor}" />
290+
<SolidColorBrush x:Key="SystemColorGrayTextColorBrush" Color="{StaticResource SystemColorGrayTextColor}" />
317291

318292
<!-- Control brushes -->
319293

@@ -390,7 +364,7 @@
390364
<SolidColorBrush x:Key="CheckBoxCheckBackgroundFillCheckedPressed" Color="{DynamicResource SystemAccentColorSecondary}" Opacity="0.8" />
391365
<SolidColorBrush x:Key="CheckBoxCheckBackgroundFillUncheckedPointerOver" Color="{StaticResource ControlAltFillColorTertiary}" />
392366
<SolidColorBrush x:Key="CheckBoxCheckBackgroundFillUncheckedPressed" Color="{StaticResource ControlAltFillColorQuarternary}" />
393-
<SolidColorBrush x:Key="CheckBoxCheckBorderBrushUncheckedPressed" Color="{StaticResource SubtleBorderBrushTertiary}" />
367+
<SolidColorBrush x:Key="CheckBoxCheckBorderBrushUncheckedPressed" Color="{StaticResource SubtleFillColorTransparent}" />
394368
<SolidColorBrush x:Key="CheckBoxCheckBackgroundFillUncheckedDisabled" Color="{StaticResource ControlAltFillColorDisabled}" />
395369
<SolidColorBrush x:Key="CheckBoxCheckBackgroundStrokeUncheckedDisabled" Color="{StaticResource ControlStrongStrokeColorDisabled}" />
396370
<SolidColorBrush x:Key="CheckBoxForegroundUncheckedDisabled" Color="{StaticResource TextFillColorDisabled}" />

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

Lines changed: 2 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,9 @@
4545
<SolidColorBrush x:Key="TextFillColorSecondaryBrush" Color="{StaticResource SystemColorWindowTextColor}" />
4646
<SolidColorBrush x:Key="TextFillColorTertiaryBrush" Color="{StaticResource SystemColorWindowTextColor}" />
4747
<SolidColorBrush x:Key="TextFillColorDisabledBrush" Color="{StaticResource SystemColorGrayTextColor}" />
48-
<SolidColorBrush x:Key="TextPlaceholderColorBrush" Color="{StaticResource SystemColorGrayTextColor}" />
4948
<SolidColorBrush x:Key="TextFillColorInverseBrush" Color="{StaticResource SystemColorWindowTextColor}" />
5049

51-
<SolidColorBrush x:Key="AccentTextFillColorDisabledBrush" Color="{StaticResource SystemColorWindowTextColor}" />
50+
<SolidColorBrush x:Key="AccentTextFillColorDisabledBrush" Color="{StaticResource SystemColorGrayTextColor}" />
5251

5352
<SolidColorBrush x:Key="TextOnAccentFillColorSelectedTextBrush" Color="{StaticResource SystemColorWindowTextColor}" />
5453

@@ -88,11 +87,10 @@
8887

8988
<SolidColorBrush x:Key="ControlStrokeColorDefaultBrush" Color="{StaticResource SystemColorButtonTextColor}" />
9089
<SolidColorBrush x:Key="ControlStrokeColorSecondaryBrush" Color="{StaticResource SystemColorButtonTextColor}" />
91-
<SolidColorBrush x:Key="ControlStrokeColorTertiaryBrush" Color="{StaticResource SystemColorButtonTextColor}" />
9290
<SolidColorBrush x:Key="ControlStrokeColorOnAccentDefaultBrush" Color="{StaticResource SystemColorButtonTextColor}" />
9391
<SolidColorBrush x:Key="ControlStrokeColorOnAccentSecondaryBrush" Color="{StaticResource SystemColorButtonTextColor}" />
9492
<SolidColorBrush x:Key="ControlStrokeColorOnAccentTertiaryBrush" Color="{StaticResource SystemColorButtonTextColor}" />
95-
<SolidColorBrush x:Key="ControlStrokeColorOnAccentDisabledBrush" Color="{StaticResource SystemColorButtonTextColor}" />
93+
<SolidColorBrush x:Key="ControlStrokeColorOnAccentDisabledBrush" Color="{StaticResource SystemColorGrayTextColor}" />
9694

9795
<SolidColorBrush x:Key="ControlStrokeColorForStrongFillWhenOnImageBrush" Color="{StaticResource SystemColorButtonTextColor}" />
9896

@@ -161,45 +159,6 @@
161159
<SolidColorBrush x:Key="SystemColorHotlightColorBrush" Color="{StaticResource SystemColorHotlightColor}" />
162160
<SolidColorBrush x:Key="SystemColorGrayTextColorBrush" Color="{StaticResource SystemColorGrayTextColor}" />
163161

164-
<DrawingBrush
165-
x:Key="StripedBackgroundBrush"
166-
Stretch="UniformToFill"
167-
TileMode="Tile"
168-
Viewport="0,0,10,10"
169-
ViewportUnits="Absolute">
170-
<DrawingBrush.Drawing>
171-
<DrawingGroup>
172-
<DrawingGroup.Children>
173-
<GeometryDrawing Brush="#0DFFFFFF">
174-
<GeometryDrawing.Geometry>
175-
<GeometryGroup FillRule="Nonzero">
176-
<PathGeometry>
177-
<PathFigure StartPoint="0,0">
178-
<LineSegment Point="25,0" />
179-
<LineSegment Point="100,75" />
180-
<LineSegment Point="100,100" />
181-
<LineSegment Point="75,100" />
182-
<LineSegment Point="0,25" />
183-
<LineSegment Point="0,0" />
184-
</PathFigure>
185-
<PathFigure StartPoint="75,0">
186-
<LineSegment Point="100,25" />
187-
<LineSegment Point="100,0" />
188-
</PathFigure>
189-
<PathFigure StartPoint="0,75">
190-
<LineSegment Point="25,100" />
191-
<LineSegment Point="0,100" />
192-
</PathFigure>
193-
</PathGeometry>
194-
</GeometryGroup>
195-
</GeometryDrawing.Geometry>
196-
</GeometryDrawing>
197-
</DrawingGroup.Children>
198-
</DrawingGroup>
199-
</DrawingBrush.Drawing>
200-
</DrawingBrush>
201-
202-
203162
<!-- Control brushes -->
204163

205164
<!-- Badge -->
@@ -596,7 +555,6 @@
596555
<Color x:Key="TextFillColorSecondary">#FFFFFF</Color>
597556
<Color x:Key="TextFillColorTertiary">#FFFFFF</Color>
598557
<Color x:Key="TextFillColorDisabled">#A6A6A6</Color>
599-
<Color x:Key="TextPlaceholderColor">#FF0000</Color>
600558
<Color x:Key="TextFillColorInverse">#FFFFFF</Color>
601559

602560
<Color x:Key="AccentTextFillColorDisabled">#A6A6A6</Color>
@@ -637,7 +595,6 @@
637595

638596
<Color x:Key="ControlStrokeColorDefault">#B6F6F0</Color>
639597
<Color x:Key="ControlStrokeColorSecondary">#B6F6F0</Color>
640-
<Color x:Key="ControlStrokeColorTertiary">#B6F6F0</Color>
641598
<Color x:Key="ControlStrokeColorOnAccentDefault">#B6F6F0</Color>
642599
<Color x:Key="ControlStrokeColorOnAccentSecondary">#B6F6F0</Color>
643600
<Color x:Key="ControlStrokeColorOnAccentTertiary">#B6F6F0</Color>

0 commit comments

Comments
 (0)