Merge pull request unoplatform#16252 from unoplatform/dev/mazi/thumb-…

…square
jeromelaban · Apr 13, 2024 · d88463a · d88463a
2 parents 13a2a95 + 0f6280a
commit d88463a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/Uno.UI.FluentTheme.v2/Resources/Version2/PriorityDefault/ColorPicker.xaml b/src/Uno.UI.FluentTheme.v2/Resources/Version2/PriorityDefault/ColorPicker.xaml
@@ -5,7 +5,9 @@
     xmlns:controls="using:Microsoft.UI.Xaml.Controls"
     xmlns:primitives="using:Microsoft.UI.Xaml.Controls.Primitives"
     xmlns:contract7Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,7)"
-    xmlns:contract7NotPresent="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Windows.Foundation.UniversalApiContract,7)">
+    xmlns:contract7NotPresent="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Windows.Foundation.UniversalApiContract,7)"
+    xmlns:not_win="http://uno.ui/not_win"
+    xmlns:win="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 
     <Style TargetType="controls:ColorPicker" BasedOn="{StaticResource DefaultColorPickerStyle}"/>
 
@@ -508,7 +510,10 @@
                                 <Setter Property="Template">
                                     <Setter.Value>
                                         <ControlTemplate TargetType="Thumb">
-                                            <Border BorderBrush="{ThemeResource SliderThumbBorderBrush}"
+                                            <!-- Uno specific (LinearGradientBrush borders): Use solid border brush #6457 -->
+                                            <Border 
+                                                win:BorderBrush="{ThemeResource SliderThumbBorderBrush}"
+                                                not_win:BorderBrush="{ThemeResource ControlStrokeColorDefaultBrush}"
                                                 BorderThickness="{TemplateBinding BorderThickness}"
                                                 Background="{ThemeResource SliderOuterThumbBackground}"
                                                 CornerRadius="{ThemeResource SliderThumbCornerRadius}">

diff --git a/src/Uno.UI.FluentTheme.v2/Resources/Version2/PriorityDefault/Slider_themeresources.xaml b/src/Uno.UI.FluentTheme.v2/Resources/Version2/PriorityDefault/Slider_themeresources.xaml
@@ -199,7 +199,7 @@
         <Setter Property="Background" Value="{ThemeResource SliderTrackFill}" />
         <Setter Property="BorderThickness" Value="{ThemeResource SliderBorderThemeThickness}" />
 
-        <!-- Uno specific (LinearGradientBrush borders): Use solid border brush -->
+        <!-- Uno specific (LinearGradientBrush borders): Use solid border brush #6457 -->
         <win:Setter Property="BorderBrush" Value="{ThemeResource SliderThumbBorderBrush}"/>
         <not_win:Setter Property="BorderBrush" Value="{ThemeResource ControlStrokeColorDefaultBrush}" />