From a43b23dec0f2622ea725f7d4380eb70469e81c1a Mon Sep 17 00:00:00 2001
From: "NVENTIVE\\vy.nguyen" <vy.nguyen@nventive.com>
Date: Mon, 14 Aug 2023 15:23:33 -0400
Subject: [PATCH 1/2] fix: Slider styles

---
 .../Styles/Controls/v2/Slider.xaml             | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/library/Uno.Material/Styles/Controls/v2/Slider.xaml b/src/library/Uno.Material/Styles/Controls/v2/Slider.xaml
index bcb03d04c..46a91e014 100644
--- a/src/library/Uno.Material/Styles/Controls/v2/Slider.xaml
+++ b/src/library/Uno.Material/Styles/Controls/v2/Slider.xaml
@@ -1,4 +1,4 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 					xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 					xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 					xmlns:not_win="http://uno.ui/not_win"
@@ -22,8 +22,8 @@
 			<StaticResource x:Key="SliderTrackFillDisabled" ResourceKey="OnSurfaceSelectedBrush" />
 			<StaticResource x:Key="SliderTrackValueFill" ResourceKey="PrimaryBrush" />
 			<StaticResource x:Key="SliderTrackValueFillDisabled" ResourceKey="SystemControlDisabledChromeDisabledHighBrush" />
-			<CornerRadius x:Key="SliderHorizontalFillCornerRadius">4,0,0,4</CornerRadius>
-			<CornerRadius x:Key="SliderVerticalFillCornerRadius">0,0,4,4</CornerRadius>
+			<CornerRadius x:Key="SliderHorizontalFillCornerRadius">3,0,0,3</CornerRadius>
+			<CornerRadius x:Key="SliderVerticalFillCornerRadius">0,0,3,3</CornerRadius>
 			<x:Double x:Key="SliderTrackThickness">4</x:Double>
 			<x:Double x:Key="SliderFillThickness">6</x:Double>
 
@@ -48,6 +48,7 @@
 			<x:Double x:Key="SliderThumbWidth">20</x:Double>
 			<x:Double x:Key="SliderThumbHeight">20</x:Double>
 			<x:Double x:Key="SliderThumbCornerRadius">10</x:Double>
+			<Thickness x:Key="SliderThumbMargin">-1</Thickness>
 			<Thickness x:Key="SliderHorizontalFocusVisualMargin">-14,-6,-14,-6</Thickness>
 			<Thickness x:Key="SliderVerticalFocusVisualMargin">-6,-14,-6,-14</Thickness>
 			<StaticResource x:Key="SliderTrackCornerRadius" ResourceKey="ControlCornerRadius" />
@@ -70,8 +71,8 @@
 			<StaticResource x:Key="SliderTrackFillDisabled" ResourceKey="OnSurfaceSelectedBrush" />
 			<StaticResource x:Key="SliderTrackValueFill" ResourceKey="PrimaryBrush" />
 			<StaticResource x:Key="SliderTrackValueFillDisabled" ResourceKey="SystemControlDisabledChromeDisabledHighBrush" />
-			<CornerRadius x:Key="SliderHorizontalFillCornerRadius">4,0,0,4</CornerRadius>
-			<CornerRadius x:Key="SliderVerticalFillCornerRadius">0,0,4,4</CornerRadius>
+			<CornerRadius x:Key="SliderHorizontalFillCornerRadius">3,0,0,3</CornerRadius>
+			<CornerRadius x:Key="SliderVerticalFillCornerRadius">0,0,3,3</CornerRadius>
 			<x:Double x:Key="SliderTrackThickness">4</x:Double>
 			<x:Double x:Key="SliderFillThickness">6</x:Double>
 
@@ -96,6 +97,7 @@
 			<x:Double x:Key="SliderThumbWidth">20</x:Double>
 			<x:Double x:Key="SliderThumbHeight">20</x:Double>
 			<x:Double x:Key="SliderThumbCornerRadius">10</x:Double>
+			<Thickness x:Key="SliderThumbMargin">-1</Thickness>
 			<StaticResource x:Key="SliderTrackCornerRadius" ResourceKey="ControlCornerRadius" />
 			<Thickness x:Key="SliderHorizontalFocusVisualMargin">-14,-6,-14,-6</Thickness>
 			<Thickness x:Key="SliderVerticalFocusVisualMargin">-6,-14,-6,-14</Thickness>
@@ -283,7 +285,8 @@
 									   AutomationProperties.AccessibilityView="Raw"
 									   DataContext="{TemplateBinding Value}"
 									   FocusVisualMargin="{ThemeResource SliderHorizontalFocusVisualMargin}"
-									   Style="{StaticResource MaterialSliderThumbStyle}" />
+									   Style="{StaticResource MaterialSliderThumbStyle}"
+									   Margin="{ThemeResource SliderThumbMargin}" />
 							</Grid>
 
 							<!-- VerticalTemplate -->
@@ -358,7 +361,8 @@
 									   AutomationProperties.AccessibilityView="Raw"
 									   DataContext="{TemplateBinding Value}"
 									   FocusVisualMargin="{ThemeResource SliderVerticalFocusVisualMargin}"
-									   Style="{StaticResource MaterialSliderThumbStyle}" />
+									   Style="{StaticResource MaterialSliderThumbStyle}"
+									   Margin="{ThemeResource SliderThumbMargin}" />
 							</Grid>
 						</Grid>
 					</Grid>

From 8d55b8ca094cbddac507a1951c30e6e096bbdf42 Mon Sep 17 00:00:00 2001
From: "NVENTIVE\\vy.nguyen" <vy.nguyen@nventive.com>
Date: Wed, 16 Aug 2023 15:04:13 -0400
Subject: [PATCH 2/2] fix: corner radius

---
 src/library/Uno.Material/Styles/Controls/v2/Slider.xaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/library/Uno.Material/Styles/Controls/v2/Slider.xaml b/src/library/Uno.Material/Styles/Controls/v2/Slider.xaml
index 46a91e014..43ee186d3 100644
--- a/src/library/Uno.Material/Styles/Controls/v2/Slider.xaml
+++ b/src/library/Uno.Material/Styles/Controls/v2/Slider.xaml
@@ -51,7 +51,7 @@
 			<Thickness x:Key="SliderThumbMargin">-1</Thickness>
 			<Thickness x:Key="SliderHorizontalFocusVisualMargin">-14,-6,-14,-6</Thickness>
 			<Thickness x:Key="SliderVerticalFocusVisualMargin">-6,-14,-6,-14</Thickness>
-			<StaticResource x:Key="SliderTrackCornerRadius" ResourceKey="ControlCornerRadius" />
+			<CornerRadius x:Key="SliderTrackCornerRadius">2</CornerRadius>
 		</ResourceDictionary>
 
 		<!-- Dark Theme -->
@@ -98,9 +98,9 @@
 			<x:Double x:Key="SliderThumbHeight">20</x:Double>
 			<x:Double x:Key="SliderThumbCornerRadius">10</x:Double>
 			<Thickness x:Key="SliderThumbMargin">-1</Thickness>
-			<StaticResource x:Key="SliderTrackCornerRadius" ResourceKey="ControlCornerRadius" />
 			<Thickness x:Key="SliderHorizontalFocusVisualMargin">-14,-6,-14,-6</Thickness>
 			<Thickness x:Key="SliderVerticalFocusVisualMargin">-6,-14,-6,-14</Thickness>
+			<CornerRadius x:Key="SliderTrackCornerRadius">2</CornerRadius>
 		</ResourceDictionary>
 	</ResourceDictionary.ThemeDictionaries>