Skip to content

Commit 5f73690

Browse files
dipeshmsftpegasus-lynx
dipeshmsft
and
pegasus-lynx
authored
Added TextControlElevationFocusedBorderBrush to fluent resources (#10685)
Co-authored-by: Dipesh Kumar <[email protected]>
1 parent 4aff730 commit 5f73690

File tree

6 files changed

+40
-0
lines changed

6 files changed

+40
-0
lines changed

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

+10
Original file line numberDiff line numberDiff line change
@@ -296,6 +296,16 @@
296296
</LinearGradientBrush.GradientStops>
297297
</LinearGradientBrush>
298298

299+
<LinearGradientBrush x:Key="TextControlElevationBorderFocusedBrush" MappingMode="Absolute" StartPoint="0,0" EndPoint="0,2">
300+
<LinearGradientBrush.RelativeTransform>
301+
<ScaleTransform ScaleY="-1" CenterY="0.5" />
302+
</LinearGradientBrush.RelativeTransform>
303+
<LinearGradientBrush.GradientStops>
304+
<GradientStop Offset="1.0" Color="{StaticResource SystemAccentColorLight2}" />
305+
<GradientStop Offset="1.0" Color="{StaticResource ControlStrokeColorDefault}" />
306+
</LinearGradientBrush.GradientStops>
307+
</LinearGradientBrush>
308+
299309
<SolidColorBrush x:Key="SystemColorWindowTextColorBrush" Color="{StaticResource SystemColorWindowTextColor}" />
300310
<SolidColorBrush x:Key="SystemColorWindowColorBrush" Color="{StaticResource SystemColorWindowColor}" />
301311
<SolidColorBrush x:Key="SystemColorButtonFaceColorBrush" Color="{StaticResource SystemColorButtonFaceColor}" />

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

+1
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,7 @@
163163
<SolidColorBrush x:Key="CircleElevationBorderBrush" Color="{StaticResource SystemColorWindowTextColor}" />
164164
<SolidColorBrush x:Key="AccentControlElevationBorderBrush" Color="{StaticResource SystemColorWindowTextColor}" />
165165
<SolidColorBrush x:Key="TextControlElevationBorderBrush" Color="{StaticResource SystemColorWindowTextColor}" />
166+
<SolidColorBrush x:Key="TextControlElevationBorderFocusedBrush" Color="{StaticResource SystemColorHighlightColor}" />
166167

167168
<SolidColorBrush x:Key="SystemColorWindowTextColorBrush" Color="{StaticResource SystemColorWindowTextColor}" />
168169
<SolidColorBrush x:Key="SystemColorWindowColorBrush" Color="{StaticResource SystemColorWindowColor}" />

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

+10
Original file line numberDiff line numberDiff line change
@@ -299,6 +299,16 @@
299299
</LinearGradientBrush.GradientStops>
300300
</LinearGradientBrush>
301301

302+
<LinearGradientBrush x:Key="TextControlElevationBorderFocusedBrush" MappingMode="Absolute" StartPoint="0,0" EndPoint="0,2">
303+
<LinearGradientBrush.RelativeTransform>
304+
<ScaleTransform ScaleY="-1" CenterY="0.5" />
305+
</LinearGradientBrush.RelativeTransform>
306+
<LinearGradientBrush.GradientStops>
307+
<GradientStop Offset="1.0" Color="{StaticResource SystemAccentColorDark1}" />
308+
<GradientStop Offset="1.0" Color="{StaticResource ControlStrokeColorDefault}" />
309+
</LinearGradientBrush.GradientStops>
310+
</LinearGradientBrush>
311+
302312
<SolidColorBrush x:Key="SystemColorWindowTextColorBrush" Color="{StaticResource SystemColorWindowTextColor}" />
303313
<SolidColorBrush x:Key="SystemColorWindowColorBrush" Color="{StaticResource SystemColorWindowColor}" />
304314
<SolidColorBrush x:Key="SystemColorButtonFaceColorBrush" Color="{StaticResource SystemColorButtonFaceColor}" />

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

+9
Original file line numberDiff line numberDiff line change
@@ -306,6 +306,15 @@
306306
<GradientStop Offset="1.0" Color="{StaticResource ControlStrokeColorDefault}" />
307307
</LinearGradientBrush.GradientStops>
308308
</LinearGradientBrush>
309+
<LinearGradientBrush x:Key="TextControlElevationBorderFocusedBrush" MappingMode="Absolute" StartPoint="0,0" EndPoint="0,2">
310+
<LinearGradientBrush.RelativeTransform>
311+
<ScaleTransform ScaleY="-1" CenterY="0.5" />
312+
</LinearGradientBrush.RelativeTransform>
313+
<LinearGradientBrush.GradientStops>
314+
<GradientStop Offset="1.0" Color="{StaticResource SystemAccentColorLight2}" />
315+
<GradientStop Offset="1.0" Color="{StaticResource ControlStrokeColorDefault}" />
316+
</LinearGradientBrush.GradientStops>
317+
</LinearGradientBrush>
309318
<SolidColorBrush x:Key="SystemColorWindowTextColorBrush" Color="{StaticResource SystemColorWindowTextColor}" />
310319
<SolidColorBrush x:Key="SystemColorWindowColorBrush" Color="{StaticResource SystemColorWindowColor}" />
311320
<SolidColorBrush x:Key="SystemColorButtonFaceColorBrush" Color="{StaticResource SystemColorButtonFaceColor}" />

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

+1
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,7 @@
201201
<SolidColorBrush x:Key="CircleElevationBorderBrush" Color="{StaticResource SystemColorWindowTextColor}" />
202202
<SolidColorBrush x:Key="AccentControlElevationBorderBrush" Color="{StaticResource SystemColorWindowTextColor}" />
203203
<SolidColorBrush x:Key="TextControlElevationBorderBrush" Color="{StaticResource SystemColorWindowTextColor}" />
204+
<SolidColorBrush x:Key="TextControlElevationBorderFocusedBrush" Color="{StaticResource SystemColorHighlightColor}" />
204205
<SolidColorBrush x:Key="SystemColorWindowTextColorBrush" Color="{StaticResource SystemColorWindowTextColor}" />
205206
<SolidColorBrush x:Key="SystemColorWindowColorBrush" Color="{StaticResource SystemColorWindowColor}" />
206207
<SolidColorBrush x:Key="SystemColorButtonFaceColorBrush" Color="{StaticResource SystemColorButtonFaceColor}" />

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

+9
Original file line numberDiff line numberDiff line change
@@ -309,6 +309,15 @@
309309
<GradientStop Offset="1.0" Color="{StaticResource ControlStrokeColorDefault}" />
310310
</LinearGradientBrush.GradientStops>
311311
</LinearGradientBrush>
312+
<LinearGradientBrush x:Key="TextControlElevationBorderFocusedBrush" MappingMode="Absolute" StartPoint="0,0" EndPoint="0,2">
313+
<LinearGradientBrush.RelativeTransform>
314+
<ScaleTransform ScaleY="-1" CenterY="0.5" />
315+
</LinearGradientBrush.RelativeTransform>
316+
<LinearGradientBrush.GradientStops>
317+
<GradientStop Offset="1.0" Color="{StaticResource SystemAccentColorDark1}" />
318+
<GradientStop Offset="1.0" Color="{StaticResource ControlStrokeColorDefault}" />
319+
</LinearGradientBrush.GradientStops>
320+
</LinearGradientBrush>
312321
<SolidColorBrush x:Key="SystemColorWindowTextColorBrush" Color="{StaticResource SystemColorWindowTextColor}" />
313322
<SolidColorBrush x:Key="SystemColorWindowColorBrush" Color="{StaticResource SystemColorWindowColor}" />
314323
<SolidColorBrush x:Key="SystemColorButtonFaceColorBrush" Color="{StaticResource SystemColorButtonFaceColor}" />

0 commit comments

Comments
 (0)