Skip to content

Commit e3ce5f8

Browse files
dipeshmsftpegasus-lynx
dipeshmsft
and
pegasus-lynx
authored
Fixed elevation border brush for Light and Dark theme (#10567)
Co-authored-by: Dipesh Kumar <[email protected]>
1 parent 7df0d6d commit e3ce5f8

File tree

4 files changed

+60
-36
lines changed

4 files changed

+60
-36
lines changed

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

+12-9
Original file line numberDiff line numberDiff line change
@@ -263,9 +263,6 @@
263263
<!-- Elevation border brushes -->
264264

265265
<LinearGradientBrush x:Key="ControlElevationBorderBrush" MappingMode="Absolute" StartPoint="0,0" EndPoint="0,3">
266-
<!--<LinearGradientBrush.RelativeTransform>
267-
<ScaleTransform CenterY="0.5" ScaleY="-1" />
268-
</LinearGradientBrush.RelativeTransform>-->
269266
<LinearGradientBrush.GradientStops>
270267
<GradientStop Offset="0.33" Color="{StaticResource ControlStrokeColorSecondary}" />
271268
<GradientStop Offset="1.0" Color="{StaticResource ControlStrokeColorDefault}" />
@@ -279,17 +276,23 @@
279276
</LinearGradientBrush.GradientStops>
280277
</LinearGradientBrush>
281278

282-
<LinearGradientBrush x:Key="AccentControlElevationBorderBrush" MappingMode="RelativeToBoundingBox" StartPoint="0,1" EndPoint="0,0">
279+
<LinearGradientBrush x:Key="AccentControlElevationBorderBrush" MappingMode="Absolute" StartPoint="0,0" EndPoint="0,3">
280+
<LinearGradientBrush.RelativeTransform>
281+
<ScaleTransform ScaleY="-1" CenterY="0.5" />
282+
</LinearGradientBrush.RelativeTransform>
283283
<LinearGradientBrush.GradientStops>
284-
<GradientStop Offset="0.025" Color="{StaticResource ControlStrokeColorOnAccentSecondary}" />
285-
<GradientStop Offset="0.075" Color="{StaticResource ControlStrokeColorOnAccentDefault}" />
284+
<GradientStop Offset="0.33" Color="{StaticResource ControlStrokeColorOnAccentSecondary}" />
285+
<GradientStop Offset="1.0" Color="{StaticResource ControlStrokeColorOnAccentDefault}" />
286286
</LinearGradientBrush.GradientStops>
287287
</LinearGradientBrush>
288288

289-
<LinearGradientBrush x:Key="TextControlElevationBorderBrush" MappingMode="RelativeToBoundingBox" StartPoint="0,1" EndPoint="0,0">
289+
<LinearGradientBrush x:Key="TextControlElevationBorderBrush" MappingMode="Absolute" StartPoint="0,0" EndPoint="0,2">
290+
<LinearGradientBrush.RelativeTransform>
291+
<ScaleTransform ScaleY="-1" CenterY="0.5" />
292+
</LinearGradientBrush.RelativeTransform>
290293
<LinearGradientBrush.GradientStops>
291-
<GradientStop Offset="0.025" Color="{StaticResource ControlStrongStrokeColorDefault}" />
292-
<GradientStop Offset="0.05" Color="{StaticResource ControlStrokeColorDefault}" />
294+
<GradientStop Offset="0.5" Color="{StaticResource ControlStrongStrokeColorDefault}" />
295+
<GradientStop Offset="1.0" Color="{StaticResource ControlStrokeColorDefault}" />
293296
</LinearGradientBrush.GradientStops>
294297
</LinearGradientBrush>
295298

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

+18-9
Original file line numberDiff line numberDiff line change
@@ -262,10 +262,13 @@
262262

263263
<!-- Elevation border brushes -->
264264

265-
<LinearGradientBrush x:Key="ControlElevationBorderBrush" MappingMode="RelativeToBoundingBox" StartPoint="0,1" EndPoint="0,0">
265+
<LinearGradientBrush x:Key="ControlElevationBorderBrush" MappingMode="Absolute" StartPoint="0,0" EndPoint="0,3">
266+
<LinearGradientBrush.RelativeTransform>
267+
<ScaleTransform ScaleY="-1" CenterY="0.5" />
268+
</LinearGradientBrush.RelativeTransform>
266269
<LinearGradientBrush.GradientStops>
267-
<GradientStop Offset="0.025" Color="{StaticResource ControlStrokeColorSecondary}" />
268-
<GradientStop Offset="0.075" Color="{StaticResource ControlStrokeColorDefault}" />
270+
<GradientStop Offset="0.33" Color="{StaticResource ControlStrokeColorSecondary}" />
271+
<GradientStop Offset="1.0" Color="{StaticResource ControlStrokeColorDefault}" />
269272
</LinearGradientBrush.GradientStops>
270273
</LinearGradientBrush>
271274

@@ -276,17 +279,23 @@
276279
</LinearGradientBrush.GradientStops>
277280
</LinearGradientBrush>
278281

279-
<LinearGradientBrush x:Key="AccentControlElevationBorderBrush" MappingMode="RelativeToBoundingBox" StartPoint="0,1" EndPoint="0,0">
282+
<LinearGradientBrush x:Key="AccentControlElevationBorderBrush" MappingMode="Absolute" StartPoint="0,0" EndPoint="0,3">
283+
<LinearGradientBrush.RelativeTransform>
284+
<ScaleTransform ScaleY="-1" CenterY="0.5" />
285+
</LinearGradientBrush.RelativeTransform>
280286
<LinearGradientBrush.GradientStops>
281-
<GradientStop Offset="0.025" Color="{StaticResource ControlStrokeColorOnAccentSecondary}" />
282-
<GradientStop Offset="0.075" Color="{StaticResource ControlStrokeColorOnAccentDefault}" />
287+
<GradientStop Offset="0.33" Color="{StaticResource ControlStrokeColorOnAccentSecondary}" />
288+
<GradientStop Offset="1.0" Color="{StaticResource ControlStrokeColorOnAccentDefault}" />
283289
</LinearGradientBrush.GradientStops>
284290
</LinearGradientBrush>
285291

286-
<LinearGradientBrush x:Key="TextControlElevationBorderBrush" MappingMode="RelativeToBoundingBox" StartPoint="0,1" EndPoint="0,0">
292+
<LinearGradientBrush x:Key="TextControlElevationBorderBrush" MappingMode="Absolute" StartPoint="0,0" EndPoint="0,2">
293+
<LinearGradientBrush.RelativeTransform>
294+
<ScaleTransform ScaleY="-1" CenterY="0.5" />
295+
</LinearGradientBrush.RelativeTransform>
287296
<LinearGradientBrush.GradientStops>
288-
<GradientStop Offset="0.025" Color="{StaticResource ControlStrongStrokeColorDefault}" />
289-
<GradientStop Offset="0.05" Color="{StaticResource ControlStrokeColorDefault}" />
297+
<GradientStop Offset="0.5" Color="{StaticResource ControlStrongStrokeColorDefault}" />
298+
<GradientStop Offset="1.0" Color="{StaticResource ControlStrokeColorDefault}" />
290299
</LinearGradientBrush.GradientStops>
291300
</LinearGradientBrush>
292301

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

+12-9
Original file line numberDiff line numberDiff line change
@@ -277,9 +277,6 @@
277277
<SolidColorBrush x:Key="SystemFillColorSolidNeutralBackgroundBrush" Color="{StaticResource SystemFillColorSolidNeutralBackground}" />
278278
<!-- Elevation border brushes -->
279279
<LinearGradientBrush x:Key="ControlElevationBorderBrush" MappingMode="Absolute" StartPoint="0,0" EndPoint="0,3">
280-
<!--<LinearGradientBrush.RelativeTransform>
281-
<ScaleTransform CenterY="0.5" ScaleY="-1" />
282-
</LinearGradientBrush.RelativeTransform>-->
283280
<LinearGradientBrush.GradientStops>
284281
<GradientStop Offset="0.33" Color="{StaticResource ControlStrokeColorSecondary}" />
285282
<GradientStop Offset="1.0" Color="{StaticResource ControlStrokeColorDefault}" />
@@ -291,16 +288,22 @@
291288
<GradientStop Offset="0.50" Color="{StaticResource ControlStrokeColorDefault}" />
292289
</LinearGradientBrush.GradientStops>
293290
</LinearGradientBrush>
294-
<LinearGradientBrush x:Key="AccentControlElevationBorderBrush" MappingMode="RelativeToBoundingBox" StartPoint="0,1" EndPoint="0,0">
291+
<LinearGradientBrush x:Key="AccentControlElevationBorderBrush" MappingMode="Absolute" StartPoint="0,0" EndPoint="0,3">
292+
<LinearGradientBrush.RelativeTransform>
293+
<ScaleTransform ScaleY="-1" CenterY="0.5" />
294+
</LinearGradientBrush.RelativeTransform>
295295
<LinearGradientBrush.GradientStops>
296-
<GradientStop Offset="0.025" Color="{StaticResource ControlStrokeColorOnAccentSecondary}" />
297-
<GradientStop Offset="0.075" Color="{StaticResource ControlStrokeColorOnAccentDefault}" />
296+
<GradientStop Offset="0.33" Color="{StaticResource ControlStrokeColorOnAccentSecondary}" />
297+
<GradientStop Offset="1.0" Color="{StaticResource ControlStrokeColorOnAccentDefault}" />
298298
</LinearGradientBrush.GradientStops>
299299
</LinearGradientBrush>
300-
<LinearGradientBrush x:Key="TextControlElevationBorderBrush" MappingMode="RelativeToBoundingBox" StartPoint="0,1" EndPoint="0,0">
300+
<LinearGradientBrush x:Key="TextControlElevationBorderBrush" MappingMode="Absolute" StartPoint="0,0" EndPoint="0,2">
301+
<LinearGradientBrush.RelativeTransform>
302+
<ScaleTransform ScaleY="-1" CenterY="0.5" />
303+
</LinearGradientBrush.RelativeTransform>
301304
<LinearGradientBrush.GradientStops>
302-
<GradientStop Offset="0.025" Color="{StaticResource ControlStrongStrokeColorDefault}" />
303-
<GradientStop Offset="0.05" Color="{StaticResource ControlStrokeColorDefault}" />
305+
<GradientStop Offset="0.5" Color="{StaticResource ControlStrongStrokeColorDefault}" />
306+
<GradientStop Offset="1.0" Color="{StaticResource ControlStrokeColorDefault}" />
304307
</LinearGradientBrush.GradientStops>
305308
</LinearGradientBrush>
306309
<SolidColorBrush x:Key="SystemColorWindowTextColorBrush" Color="{StaticResource SystemColorWindowTextColor}" />

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

+18-9
Original file line numberDiff line numberDiff line change
@@ -276,10 +276,13 @@
276276
<SolidColorBrush x:Key="SystemFillColorSolidAttentionBackgroundBrush" Color="{StaticResource SystemFillColorSolidAttentionBackground}" />
277277
<SolidColorBrush x:Key="SystemFillColorSolidNeutralBackgroundBrush" Color="{StaticResource SystemFillColorSolidNeutralBackground}" />
278278
<!-- Elevation border brushes -->
279-
<LinearGradientBrush x:Key="ControlElevationBorderBrush" MappingMode="RelativeToBoundingBox" StartPoint="0,1" EndPoint="0,0">
279+
<LinearGradientBrush x:Key="ControlElevationBorderBrush" MappingMode="Absolute" StartPoint="0,0" EndPoint="0,3">
280+
<LinearGradientBrush.RelativeTransform>
281+
<ScaleTransform ScaleY="-1" CenterY="0.5" />
282+
</LinearGradientBrush.RelativeTransform>
280283
<LinearGradientBrush.GradientStops>
281-
<GradientStop Offset="0.025" Color="{StaticResource ControlStrokeColorSecondary}" />
282-
<GradientStop Offset="0.075" Color="{StaticResource ControlStrokeColorDefault}" />
284+
<GradientStop Offset="0.33" Color="{StaticResource ControlStrokeColorSecondary}" />
285+
<GradientStop Offset="1.0" Color="{StaticResource ControlStrokeColorDefault}" />
283286
</LinearGradientBrush.GradientStops>
284287
</LinearGradientBrush>
285288
<LinearGradientBrush x:Key="CircleElevationBorderBrush" MappingMode="RelativeToBoundingBox" StartPoint="0,0" EndPoint="0,1">
@@ -288,16 +291,22 @@
288291
<GradientStop Offset="0.70" Color="{StaticResource ControlStrokeColorSecondary}" />
289292
</LinearGradientBrush.GradientStops>
290293
</LinearGradientBrush>
291-
<LinearGradientBrush x:Key="AccentControlElevationBorderBrush" MappingMode="RelativeToBoundingBox" StartPoint="0,1" EndPoint="0,0">
294+
<LinearGradientBrush x:Key="AccentControlElevationBorderBrush" MappingMode="Absolute" StartPoint="0,0" EndPoint="0,3">
295+
<LinearGradientBrush.RelativeTransform>
296+
<ScaleTransform ScaleY="-1" CenterY="0.5" />
297+
</LinearGradientBrush.RelativeTransform>
292298
<LinearGradientBrush.GradientStops>
293-
<GradientStop Offset="0.025" Color="{StaticResource ControlStrokeColorOnAccentSecondary}" />
294-
<GradientStop Offset="0.075" Color="{StaticResource ControlStrokeColorOnAccentDefault}" />
299+
<GradientStop Offset="0.33" Color="{StaticResource ControlStrokeColorOnAccentSecondary}" />
300+
<GradientStop Offset="1.0" Color="{StaticResource ControlStrokeColorOnAccentDefault}" />
295301
</LinearGradientBrush.GradientStops>
296302
</LinearGradientBrush>
297-
<LinearGradientBrush x:Key="TextControlElevationBorderBrush" MappingMode="RelativeToBoundingBox" StartPoint="0,1" EndPoint="0,0">
303+
<LinearGradientBrush x:Key="TextControlElevationBorderBrush" MappingMode="Absolute" StartPoint="0,0" EndPoint="0,2">
304+
<LinearGradientBrush.RelativeTransform>
305+
<ScaleTransform ScaleY="-1" CenterY="0.5" />
306+
</LinearGradientBrush.RelativeTransform>
298307
<LinearGradientBrush.GradientStops>
299-
<GradientStop Offset="0.025" Color="{StaticResource ControlStrongStrokeColorDefault}" />
300-
<GradientStop Offset="0.05" Color="{StaticResource ControlStrokeColorDefault}" />
308+
<GradientStop Offset="0.5" Color="{StaticResource ControlStrongStrokeColorDefault}" />
309+
<GradientStop Offset="1.0" Color="{StaticResource ControlStrokeColorDefault}" />
301310
</LinearGradientBrush.GradientStops>
302311
</LinearGradientBrush>
303312
<SolidColorBrush x:Key="SystemColorWindowTextColorBrush" Color="{StaticResource SystemColorWindowTextColor}" />

0 commit comments

Comments
 (0)