Skip to content

Commit 03fa924

Browse files
dipeshmsftpegasus-lynx
dipeshmsft
and
pegasus-lynx
authored
Added text control common resources and brushes (#10752)
* Added text control common resources and brushes * Fixed TextControlButtonBorderBrushPressed value in HC --------- Co-authored-by: Dipesh Kumar <dipeshkrj14@gmail.com>
1 parent ad30dcd commit 03fa924

File tree

7 files changed

+92
-10
lines changed

7 files changed

+92
-10
lines changed

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

+15-1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@
2222
<Color x:Key="KeyboardFocusBorderColor">#87FFFFFF</Color>
2323
<SolidColorBrush x:Key="KeyboardFocusBorderColorBrush" Color="{StaticResource KeyboardFocusBorderColor}" />
2424

25+
<!-- Common Variables -->
26+
<Thickness x:Key="TextControlBorderThemeThicknessFocused">1,1,1,2</Thickness>
27+
2528
<!-- Colors -->
2629

2730
<Color x:Key="TextFillColorPrimary">#FFFFFF</Color>
@@ -317,6 +320,17 @@
317320

318321
<!-- Control brushes -->
319322

323+
<!-- Common control brushes -->
324+
<SolidColorBrush x:Key="TextControlButtonBackground" Color="{StaticResource ControlFillColorTransparent}" />
325+
<SolidColorBrush x:Key="TextControlButtonBackgroundPointerOver" Color="{StaticResource SubtleFillColorSecondary}" />
326+
<SolidColorBrush x:Key="TextControlButtonBackgroundPressed" Color="{StaticResource SubtleFillColorTertiary}" />
327+
<SolidColorBrush x:Key="TextControlButtonBorderBrush" Color="{StaticResource ControlFillColorTransparent}" />
328+
<SolidColorBrush x:Key="TextControlButtonBorderBrushPointerOver" Color="{StaticResource ControlFillColorTransparent}" />
329+
<SolidColorBrush x:Key="TextControlButtonBorderBrushPressed" Color="{StaticResource ControlFillColorTransparent}" />
330+
<SolidColorBrush x:Key="TextControlButtonForeground" Color="{StaticResource TextFillColorSecondary}" />
331+
<SolidColorBrush x:Key="TextControlButtonForegroundPointerOver" Color="{StaticResource TextFillColorSecondary}" />
332+
<SolidColorBrush x:Key="TextControlButtonForegroundPressed" Color="{StaticResource TextFillColorTertiary}" />
333+
320334
<!-- BreadcrumbBar -->
321335
<SolidColorBrush x:Key="BreadcrumbBarNormalForegroundBrush" Color="{StaticResource TextFillColorPrimary}" />
322336
<SolidColorBrush x:Key="BreadcrumbBarHoverForegroundBrush" Color="{StaticResource TextFillColorSecondary}" />
@@ -740,7 +754,7 @@
740754
<SolidColorBrush x:Key="TextControlFocusedBorderBrush" Color="{StaticResource SystemAccentColorLight2}" />
741755
<SolidColorBrush x:Key="TextControlBorderBrushDisabled" Color="{StaticResource ControlStrokeColorDefault}" />
742756
<SolidColorBrush x:Key="TextControlPlaceholderForeground" Color="{StaticResource TextFillColorSecondary}" />
743-
<SolidColorBrush x:Key="TextControlButtonForeground" Color="{StaticResource TextFillColorSecondary}" />
757+
<!-- <SolidColorBrush x:Key="TextControlButtonForeground" Color="{StaticResource TextFillColorSecondary}" /> -->
744758

745759
<!-- Thumb -->
746760
<SolidColorBrush x:Key="ThumbBackground" Color="{StaticResource ControlStrongFillColorDefault}" />

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

+15-1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@
3434
<!-- Same as SystemColorWindowTextColor -->
3535
<SolidColorBrush x:Key="KeyboardFocusBorderColorBrush" Color="{StaticResource SystemColorWindowTextColor}" />
3636

37+
<!-- Common Variables -->
38+
<Thickness x:Key="TextControlBorderThemeThicknessFocused">2</Thickness>
39+
3740
<!-- Accent Colors and Brushes -->
3841

3942
<DynamicResource x:Key="SystemAccentColor" ResourceKey="{x:Static SystemColors.AccentColorKey}" />
@@ -176,6 +179,17 @@
176179

177180
<!-- Control brushes -->
178181

182+
<!-- Common control brushes -->
183+
<SolidColorBrush x:Key="TextControlButtonBackground" Color="Transparent" />
184+
<SolidColorBrush x:Key="TextControlButtonBackgroundPointerOver" Color="Transparent" />
185+
<SolidColorBrush x:Key="TextControlButtonBackgroundPressed" Color="{StaticResource SystemColorHighlightColor}" />
186+
<SolidColorBrush x:Key="TextControlButtonBorderBrush" Color="Transparent" />
187+
<SolidColorBrush x:Key="TextControlButtonBorderBrushPointerOver" Color="Transparent" />
188+
<SolidColorBrush x:Key="TextControlButtonBorderBrushPressed" Color="Transparent" />
189+
<SolidColorBrush x:Key="TextControlButtonForeground" Color="{StaticResource SystemColorButtonTextColor}" />
190+
<SolidColorBrush x:Key="TextControlButtonForegroundPointerOver" Color="{StaticResource SystemColorHighlightColor}" />
191+
<SolidColorBrush x:Key="TextControlButtonForegroundPressed" Color="{StaticResource SystemColorHighlightTextColor}" />
192+
179193
<!-- BreadcrumbBar -->
180194
<SolidColorBrush x:Key="BreadcrumbBarNormalForegroundBrush" Color="{StaticResource SystemColorButtonTextColor}" />
181195
<SolidColorBrush x:Key="BreadcrumbBarHoverForegroundBrush" Color="{StaticResource SystemColorHighlightColor}" />
@@ -573,7 +587,7 @@
573587
<SolidColorBrush x:Key="TextControlFocusedBorderBrush" Color="{StaticResource SystemColorHighlightColor}" />
574588
<SolidColorBrush x:Key="TextControlBorderBrushDisabled" Color="{StaticResource SystemColorGrayTextColor}" />
575589
<SolidColorBrush x:Key="TextControlPlaceholderForeground" Color="{StaticResource SystemColorGrayTextColor}" />
576-
<SolidColorBrush x:Key="TextControlButtonForeground" Color="{StaticResource SystemColorWindowTextColor}" />
590+
<!-- <SolidColorBrush x:Key="TextControlButtonForeground" Color="{StaticResource SystemColorWindowTextColor}" /> -->
577591

578592
<!-- Thumb -->
579593
<SolidColorBrush x:Key="ThumbBackground" Color="{StaticResource SystemColorButtonTextColor}" />

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

+15-1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@
2222
<Color x:Key="KeyboardFocusBorderColor">#BE000000</Color>
2323
<SolidColorBrush x:Key="KeyboardFocusBorderColorBrush" Color="{StaticResource KeyboardFocusBorderColor}" />
2424

25+
<!-- Common Variables -->
26+
<Thickness x:Key="TextControlBorderThemeThicknessFocused">1,1,1,2</Thickness>
27+
2528
<!-- Colors -->
2629

2730
<Color x:Key="TextFillColorPrimary">#E4000000</Color>
@@ -320,6 +323,17 @@
320323

321324
<!-- Control brushes -->
322325

326+
<!-- Common control brushes -->
327+
<SolidColorBrush x:Key="TextControlButtonBackground" Color="{StaticResource ControlFillColorTransparent}" />
328+
<SolidColorBrush x:Key="TextControlButtonBackgroundPointerOver" Color="{StaticResource SubtleFillColorSecondary}" />
329+
<SolidColorBrush x:Key="TextControlButtonBackgroundPressed" Color="{StaticResource SubtleFillColorTertiary}" />
330+
<SolidColorBrush x:Key="TextControlButtonBorderBrush" Color="{StaticResource ControlFillColorTransparent}" />
331+
<SolidColorBrush x:Key="TextControlButtonBorderBrushPointerOver" Color="{StaticResource ControlFillColorTransparent}" />
332+
<SolidColorBrush x:Key="TextControlButtonBorderBrushPressed" Color="{StaticResource ControlFillColorTransparent}" />
333+
<SolidColorBrush x:Key="TextControlButtonForeground" Color="{StaticResource TextFillColorSecondary}" />
334+
<SolidColorBrush x:Key="TextControlButtonForegroundPointerOver" Color="{StaticResource TextFillColorSecondary}" />
335+
<SolidColorBrush x:Key="TextControlButtonForegroundPressed" Color="{StaticResource TextFillColorTertiary}" />
336+
323337
<!-- BreadcrumbBar -->
324338
<SolidColorBrush x:Key="BreadcrumbBarNormalForegroundBrush" Color="{StaticResource TextFillColorPrimary}" />
325339
<SolidColorBrush x:Key="BreadcrumbBarHoverForegroundBrush" Color="{StaticResource TextFillColorSecondary}" />
@@ -749,7 +763,7 @@
749763
<SolidColorBrush x:Key="TextControlFocusedBorderBrush" Color="{StaticResource SystemAccentColorDark1}" />
750764
<SolidColorBrush x:Key="TextControlBorderBrushDisabled" Color="{StaticResource ControlStrokeColorDefault}" />
751765
<SolidColorBrush x:Key="TextControlPlaceholderForeground" Color="{StaticResource TextFillColorSecondary}" />
752-
<SolidColorBrush x:Key="TextControlButtonForeground" Color="{StaticResource TextFillColorSecondary}" />
766+
<!-- <SolidColorBrush x:Key="TextControlButtonForeground" Color="{StaticResource TextFillColorSecondary}" /> -->
753767

754768
<!-- Thumb -->
755769
<SolidColorBrush x:Key="ThumbBackground" Color="{StaticResource ControlStrongFillColorDefault}" />

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@
2828
-->
2929

3030
<Thickness x:Key="TextControlBorderThemeThickness">1</Thickness>
31-
<Thickness x:Key="TextControlBorderThemeThicknessFocused">2</Thickness>
31+
<!-- Moved to Light, Dark and HC resource files -->
32+
<!-- <Thickness x:Key="TextControlBorderThemeThicknessFocused">2</Thickness> -->
3233
<Thickness x:Key="TextControlThemePadding">10,5,10,6</Thickness>
3334

3435
<system:Double x:Key="ContentControlFontSize">14</system:Double>

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

+15-2
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,8 @@
6565
<Duration x:Key="ControlFasterAnimationDuration">00:00:00.083</Duration>
6666
-->
6767
<Thickness x:Key="TextControlBorderThemeThickness">1</Thickness>
68-
<Thickness x:Key="TextControlBorderThemeThicknessFocused">2</Thickness>
68+
<!-- Moved to Light, Dark and HC resource files -->
69+
<!-- <Thickness x:Key="TextControlBorderThemeThicknessFocused">2</Thickness> -->
6970
<Thickness x:Key="TextControlThemePadding">10,5,10,6</Thickness>
7071
<system:Double x:Key="ContentControlFontSize">14</system:Double>
7172
<system:Double x:Key="TextControlThemeMinHeight">24</system:Double>
@@ -90,6 +91,8 @@
9091
<SolidColorBrush x:Key="ApplicationBackgroundBrush" Color="{StaticResource ApplicationBackgroundColor}" />
9192
<Color x:Key="KeyboardFocusBorderColor">#87FFFFFF</Color>
9293
<SolidColorBrush x:Key="KeyboardFocusBorderColorBrush" Color="{StaticResource KeyboardFocusBorderColor}" />
94+
<!-- Common Variables -->
95+
<Thickness x:Key="TextControlBorderThemeThicknessFocused">1,1,1,2</Thickness>
9396
<!-- Colors -->
9497
<Color x:Key="TextFillColorPrimary">#FFFFFF</Color>
9598
<Color x:Key="TextFillColorSecondary">#C5FFFFFF</Color>
@@ -324,6 +327,16 @@
324327
<SolidColorBrush x:Key="SystemColorHotlightColorBrush" Color="{StaticResource SystemColorHotlightColor}" />
325328
<SolidColorBrush x:Key="SystemColorGrayTextColorBrush" Color="{StaticResource SystemColorGrayTextColor}" />
326329
<!-- Control brushes -->
330+
<!-- Common control brushes -->
331+
<SolidColorBrush x:Key="TextControlButtonBackground" Color="{StaticResource ControlFillColorTransparent}" />
332+
<SolidColorBrush x:Key="TextControlButtonBackgroundPointerOver" Color="{StaticResource SubtleFillColorSecondary}" />
333+
<SolidColorBrush x:Key="TextControlButtonBackgroundPressed" Color="{StaticResource SubtleFillColorTertiary}" />
334+
<SolidColorBrush x:Key="TextControlButtonBorderBrush" Color="{StaticResource ControlFillColorTransparent}" />
335+
<SolidColorBrush x:Key="TextControlButtonBorderBrushPointerOver" Color="{StaticResource ControlFillColorTransparent}" />
336+
<SolidColorBrush x:Key="TextControlButtonBorderBrushPressed" Color="{StaticResource ControlFillColorTransparent}" />
337+
<SolidColorBrush x:Key="TextControlButtonForeground" Color="{StaticResource TextFillColorSecondary}" />
338+
<SolidColorBrush x:Key="TextControlButtonForegroundPointerOver" Color="{StaticResource TextFillColorSecondary}" />
339+
<SolidColorBrush x:Key="TextControlButtonForegroundPressed" Color="{StaticResource TextFillColorTertiary}" />
327340
<!-- BreadcrumbBar -->
328341
<SolidColorBrush x:Key="BreadcrumbBarNormalForegroundBrush" Color="{StaticResource TextFillColorPrimary}" />
329342
<SolidColorBrush x:Key="BreadcrumbBarHoverForegroundBrush" Color="{StaticResource TextFillColorSecondary}" />
@@ -699,7 +712,7 @@
699712
<SolidColorBrush x:Key="TextControlFocusedBorderBrush" Color="{StaticResource SystemAccentColorLight2}" />
700713
<SolidColorBrush x:Key="TextControlBorderBrushDisabled" Color="{StaticResource ControlStrokeColorDefault}" />
701714
<SolidColorBrush x:Key="TextControlPlaceholderForeground" Color="{StaticResource TextFillColorSecondary}" />
702-
<SolidColorBrush x:Key="TextControlButtonForeground" Color="{StaticResource TextFillColorSecondary}" />
715+
<!-- <SolidColorBrush x:Key="TextControlButtonForeground" Color="{StaticResource TextFillColorSecondary}" /> -->
703716
<!-- Thumb -->
704717
<SolidColorBrush x:Key="ThumbBackground" Color="{StaticResource ControlStrongFillColorDefault}" />
705718
<!-- ThumbRate -->

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

+15-2
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,8 @@
6565
<Duration x:Key="ControlFasterAnimationDuration">00:00:00.083</Duration>
6666
-->
6767
<Thickness x:Key="TextControlBorderThemeThickness">1</Thickness>
68-
<Thickness x:Key="TextControlBorderThemeThicknessFocused">2</Thickness>
68+
<!-- Moved to Light, Dark and HC resource files -->
69+
<!-- <Thickness x:Key="TextControlBorderThemeThicknessFocused">2</Thickness> -->
6970
<Thickness x:Key="TextControlThemePadding">10,5,10,6</Thickness>
7071
<system:Double x:Key="ContentControlFontSize">14</system:Double>
7172
<system:Double x:Key="TextControlThemeMinHeight">24</system:Double>
@@ -101,6 +102,8 @@
101102
<Color x:Key="KeyboardFocusBorderColor">#FFFFFF</Color>
102103
<!-- Same as SystemColorWindowTextColor -->
103104
<SolidColorBrush x:Key="KeyboardFocusBorderColorBrush" Color="{StaticResource SystemColorWindowTextColor}" />
105+
<!-- Common Variables -->
106+
<Thickness x:Key="TextControlBorderThemeThicknessFocused">2</Thickness>
104107
<!-- Accent Colors and Brushes -->
105108
<DynamicResource x:Key="SystemAccentColor" ResourceKey="{x:Static SystemColors.AccentColorKey}" />
106109
<DynamicResource x:Key="SystemAccentColorLight1" ResourceKey="{x:Static SystemColors.AccentColorLight1Key}" />
@@ -211,6 +214,16 @@
211214
<SolidColorBrush x:Key="SystemColorHotlightColorBrush" Color="{StaticResource SystemColorHotlightColor}" />
212215
<SolidColorBrush x:Key="SystemColorGrayTextColorBrush" Color="{StaticResource SystemColorGrayTextColor}" />
213216
<!-- Control brushes -->
217+
<!-- Common control brushes -->
218+
<SolidColorBrush x:Key="TextControlButtonBackground" Color="Transparent" />
219+
<SolidColorBrush x:Key="TextControlButtonBackgroundPointerOver" Color="Transparent" />
220+
<SolidColorBrush x:Key="TextControlButtonBackgroundPressed" Color="{StaticResource SystemColorHighlightColor}" />
221+
<SolidColorBrush x:Key="TextControlButtonBorderBrush" Color="Transparent" />
222+
<SolidColorBrush x:Key="TextControlButtonBorderBrushPointerOver" Color="Transparent" />
223+
<SolidColorBrush x:Key="TextControlButtonBorderBrushPressed" Color="Transparent" />
224+
<SolidColorBrush x:Key="TextControlButtonForeground" Color="{StaticResource SystemColorButtonTextColor}" />
225+
<SolidColorBrush x:Key="TextControlButtonForegroundPointerOver" Color="{StaticResource SystemColorHighlightColor}" />
226+
<SolidColorBrush x:Key="TextControlButtonForegroundPressed" Color="{StaticResource SystemColorHighlightTextColor}" />
214227
<!-- BreadcrumbBar -->
215228
<SolidColorBrush x:Key="BreadcrumbBarNormalForegroundBrush" Color="{StaticResource SystemColorButtonTextColor}" />
216229
<SolidColorBrush x:Key="BreadcrumbBarHoverForegroundBrush" Color="{StaticResource SystemColorHighlightColor}" />
@@ -556,7 +569,7 @@
556569
<SolidColorBrush x:Key="TextControlFocusedBorderBrush" Color="{StaticResource SystemColorHighlightColor}" />
557570
<SolidColorBrush x:Key="TextControlBorderBrushDisabled" Color="{StaticResource SystemColorGrayTextColor}" />
558571
<SolidColorBrush x:Key="TextControlPlaceholderForeground" Color="{StaticResource SystemColorGrayTextColor}" />
559-
<SolidColorBrush x:Key="TextControlButtonForeground" Color="{StaticResource SystemColorWindowTextColor}" />
572+
<!-- <SolidColorBrush x:Key="TextControlButtonForeground" Color="{StaticResource SystemColorWindowTextColor}" /> -->
560573
<!-- Thumb -->
561574
<SolidColorBrush x:Key="ThumbBackground" Color="{StaticResource SystemColorButtonTextColor}" />
562575
<!-- ThumbRate -->

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

+15-2
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,8 @@
6565
<Duration x:Key="ControlFasterAnimationDuration">00:00:00.083</Duration>
6666
-->
6767
<Thickness x:Key="TextControlBorderThemeThickness">1</Thickness>
68-
<Thickness x:Key="TextControlBorderThemeThicknessFocused">2</Thickness>
68+
<!-- Moved to Light, Dark and HC resource files -->
69+
<!-- <Thickness x:Key="TextControlBorderThemeThicknessFocused">2</Thickness> -->
6970
<Thickness x:Key="TextControlThemePadding">10,5,10,6</Thickness>
7071
<system:Double x:Key="ContentControlFontSize">14</system:Double>
7172
<system:Double x:Key="TextControlThemeMinHeight">24</system:Double>
@@ -90,6 +91,8 @@
9091
<SolidColorBrush x:Key="ApplicationBackgroundBrush" Color="{StaticResource ApplicationBackgroundColor}" />
9192
<Color x:Key="KeyboardFocusBorderColor">#BE000000</Color>
9293
<SolidColorBrush x:Key="KeyboardFocusBorderColorBrush" Color="{StaticResource KeyboardFocusBorderColor}" />
94+
<!-- Common Variables -->
95+
<Thickness x:Key="TextControlBorderThemeThicknessFocused">1,1,1,2</Thickness>
9396
<!-- Colors -->
9497
<Color x:Key="TextFillColorPrimary">#E4000000</Color>
9598
<Color x:Key="TextFillColorSecondary">#9E000000</Color>
@@ -327,6 +330,16 @@
327330
<SolidColorBrush x:Key="SystemColorHotlightColorBrush" Color="{StaticResource SystemColorHotlightColor}" />
328331
<SolidColorBrush x:Key="SystemColorGrayTextColorBrush" Color="{StaticResource SystemColorGrayTextColor}" />
329332
<!-- Control brushes -->
333+
<!-- Common control brushes -->
334+
<SolidColorBrush x:Key="TextControlButtonBackground" Color="{StaticResource ControlFillColorTransparent}" />
335+
<SolidColorBrush x:Key="TextControlButtonBackgroundPointerOver" Color="{StaticResource SubtleFillColorSecondary}" />
336+
<SolidColorBrush x:Key="TextControlButtonBackgroundPressed" Color="{StaticResource SubtleFillColorTertiary}" />
337+
<SolidColorBrush x:Key="TextControlButtonBorderBrush" Color="{StaticResource ControlFillColorTransparent}" />
338+
<SolidColorBrush x:Key="TextControlButtonBorderBrushPointerOver" Color="{StaticResource ControlFillColorTransparent}" />
339+
<SolidColorBrush x:Key="TextControlButtonBorderBrushPressed" Color="{StaticResource ControlFillColorTransparent}" />
340+
<SolidColorBrush x:Key="TextControlButtonForeground" Color="{StaticResource TextFillColorSecondary}" />
341+
<SolidColorBrush x:Key="TextControlButtonForegroundPointerOver" Color="{StaticResource TextFillColorSecondary}" />
342+
<SolidColorBrush x:Key="TextControlButtonForegroundPressed" Color="{StaticResource TextFillColorTertiary}" />
330343
<!-- BreadcrumbBar -->
331344
<SolidColorBrush x:Key="BreadcrumbBarNormalForegroundBrush" Color="{StaticResource TextFillColorPrimary}" />
332345
<SolidColorBrush x:Key="BreadcrumbBarHoverForegroundBrush" Color="{StaticResource TextFillColorSecondary}" />
@@ -708,7 +721,7 @@
708721
<SolidColorBrush x:Key="TextControlFocusedBorderBrush" Color="{StaticResource SystemAccentColorDark1}" />
709722
<SolidColorBrush x:Key="TextControlBorderBrushDisabled" Color="{StaticResource ControlStrokeColorDefault}" />
710723
<SolidColorBrush x:Key="TextControlPlaceholderForeground" Color="{StaticResource TextFillColorSecondary}" />
711-
<SolidColorBrush x:Key="TextControlButtonForeground" Color="{StaticResource TextFillColorSecondary}" />
724+
<!-- <SolidColorBrush x:Key="TextControlButtonForeground" Color="{StaticResource TextFillColorSecondary}" /> -->
712725
<!-- Thumb -->
713726
<SolidColorBrush x:Key="ThumbBackground" Color="{StaticResource ControlStrongFillColorDefault}" />
714727
<!-- ThumbRate -->

0 commit comments

Comments
 (0)