Merge pull request #17240 from unoplatform/dev/mazi/thumb-margin

unoplatform · Jun 21, 2024 · ebdc751 · ebdc751
2 parents 65edb99 + 9d10428
commit ebdc751
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
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
@@ -198,8 +198,7 @@
                                         <ControlTemplate TargetType="Thumb">
                                             <!-- Uno specific (LinearGradientBrush borders): We need additional Grid here #6457 -->
                                             <Grid>
-                                                <!-- Uno specific: WinUI uses Margin -2 here, which causes clipping for us. #16484 -->
-                                                <Border x:Name="ThumbBorder" Margin="0" Background="{ThemeResource SliderOuterThumbBackground}" BorderBrush="{ThemeResource ControlStrokeColorDefaultBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{ThemeResource SliderThumbCornerRadius}">
+                                                <Border x:Name="ThumbBorder" Margin="-2" Background="{ThemeResource SliderOuterThumbBackground}" BorderBrush="{ThemeResource ControlStrokeColorDefaultBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{ThemeResource SliderThumbCornerRadius}">
                                                     <Ellipse x:Name="SliderInnerThumb" RenderTransformOrigin="0.5, 0.5" Fill="{TemplateBinding Background}" Width="{ThemeResource SliderInnerThumbWidth}" Height="{ThemeResource SliderInnerThumbHeight}">
                                                         <Ellipse.RenderTransform>
                                                             <CompositeTransform />

diff --git a/src/Uno.UI.FluentTheme.v2/themeresources_v2.xaml b/src/Uno.UI.FluentTheme.v2/themeresources_v2.xaml
@@ -21792,8 +21792,7 @@
                     <ControlTemplate TargetType="Thumb">
                       <!-- Uno specific (LinearGradientBrush borders): We need additional Grid here #6457 -->
                       <Grid>
-                        <!-- Uno specific: WinUI uses Margin -2 here, which causes clipping for us. #16484 -->
-                        <Border x:Name="ThumbBorder" Margin="0" Background="{ThemeResource SliderOuterThumbBackground}" BorderBrush="{ThemeResource ControlStrokeColorDefaultBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{ThemeResource SliderThumbCornerRadius}">
+                        <Border x:Name="ThumbBorder" Margin="-2" Background="{ThemeResource SliderOuterThumbBackground}" BorderBrush="{ThemeResource ControlStrokeColorDefaultBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{ThemeResource SliderThumbCornerRadius}">
                           <Ellipse x:Name="SliderInnerThumb" RenderTransformOrigin="0.5, 0.5" Fill="{TemplateBinding Background}" Width="{ThemeResource SliderInnerThumbWidth}" Height="{ThemeResource SliderInnerThumbHeight}">
                             <Ellipse.RenderTransform>
                               <CompositeTransform />