From a3036907b412c554a0c957bba4742b836881bc69 Mon Sep 17 00:00:00 2001
From: Martin Zikmund <martin@zikmund.dev>
Date: Fri, 12 Apr 2024 16:09:48 +0200
Subject: [PATCH] fix: Avoid square border around RangeSelector Thumbs

---
 components/RangeSelector/src/RangeSelector.xaml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/components/RangeSelector/src/RangeSelector.xaml b/components/RangeSelector/src/RangeSelector.xaml
index ea451405..cfae884c 100644
--- a/components/RangeSelector/src/RangeSelector.xaml
+++ b/components/RangeSelector/src/RangeSelector.xaml
@@ -1,7 +1,9 @@
 <!--  Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information.  -->
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:controls="using:CommunityToolkit.WinUI.Controls">
+                    xmlns:controls="using:CommunityToolkit.WinUI.Controls"
+                    xmlns:not_win="http://uno.ui/not_win"
+                    xmlns:win="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 
     <Style BasedOn="{StaticResource DefaultRangeSelectorStyle}"
            TargetType="controls:RangeSelector" />
@@ -25,6 +27,9 @@
                                    TargetType="Thumb">
                                 <Setter Property="UseSystemFocusVisuals" Value="True" />
                                 <Setter Property="BorderThickness" Value="1" />
+                                <win:Setter Property="BorderBrush" Value="{ThemeResource SliderThumbBorderBrush}"/>
+                                <!-- Uno specific (https://github.com/unoplatform/uno/issues/6457): Use solid border brush -->
+                                <not_win:Setter Property="BorderBrush" Value="{ThemeResource ControlStrokeColorDefaultBrush}" />
                                 <Setter Property="Background" Value="{ThemeResource SliderThumbBackground}" />
                                 <Setter Property="Height" Value="{ThemeResource SliderHorizontalThumbHeight}" />
                                 <Setter Property="Width" Value="{ThemeResource SliderHorizontalThumbWidth}" />
@@ -35,7 +40,7 @@
                                         <ControlTemplate TargetType="Thumb">
                                             <Border Margin="-2"
                                                     Background="{ThemeResource SliderOuterThumbBackground}"
-                                                    BorderBrush="{ThemeResource SliderThumbBorderBrush}"
+                                                    BorderBrush="{TemplateBinding BorderBrush}"
                                                     BorderThickness="{TemplateBinding BorderThickness}"
                                                     CornerRadius="{TemplateBinding CornerRadius}">
                                                 <VisualStateManager.VisualStateGroups>