Workaround for Issue #4255

microsoft · Mar 11, 2021 · 3347048 · 3347048
1 parent b799f71
commit 3347048
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/dev/CommonStyles/ScrollBar_themeresources.xaml b/dev/CommonStyles/ScrollBar_themeresources.xaml
@@ -187,7 +187,6 @@
     <x:String x:Key="ScrollBarContractDelay">00:00:02</x:String>
     <x:String x:Key="ScrollBarContractFinalKeyframe">00:00:02.1</x:String>
     <x:Double x:Key="ScrollBarSize">12</x:Double>
-    <Thickness x:Key="ScrollBarMargin">1</Thickness>
 
     <x:Double x:Key="ScrollBarVerticalThumbMinHeight">30</x:Double>
     <x:Double x:Key="ScrollBarVerticalThumbMinWidth">8</x:Double>
@@ -213,7 +212,6 @@
     <Style x:Key="DefaultScrollBarStyle" TargetType="ScrollBar">
         <Setter Property="MinWidth" Value="{StaticResource ScrollBarSize}" />
         <Setter Property="MinHeight" Value="{StaticResource ScrollBarSize}" />
-        <Setter Property="Margin" Value="{StaticResource ScrollBarMargin}"/>
         <Setter Property="Background" Value="{ThemeResource ScrollBarBackground}" />
         <Setter Property="Foreground" Value="{ThemeResource ScrollBarForeground}" />
         <Setter Property="BorderBrush" Value="{ThemeResource ScrollBarBorderBrush}" />

diff --git a/dev/ScrollView/ScrollView.xaml b/dev/ScrollView/ScrollView.xaml
@@ -6,6 +6,8 @@
     xmlns:localPrimitives="using:Microsoft.UI.Xaml.Controls.Primitives"
     xmlns:contract7Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,7)">
 
+    <Thickness x:Key="ScrollViewScrollBarMargin">1</Thickness>
+
     <Style TargetType="local:ScrollView" BasedOn="{StaticResource DefaultScrollViewStyle}" />
 
     <Style x:Key="DefaultScrollViewStyle" TargetType="local:ScrollView">
@@ -217,18 +219,22 @@
                             MaxZoomFactor="{TemplateBinding MaxZoomFactor}"
                             HorizontalAnchorRatio="{TemplateBinding HorizontalAnchorRatio}"
                             VerticalAnchorRatio="{TemplateBinding VerticalAnchorRatio}"/>
-                        <ScrollBar x:Name="PART_HorizontalScrollBar" 
+                        <Grid
                             Grid.Row="1"
-                            Orientation="Horizontal"
-                            HorizontalAlignment="Stretch"
                             Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}"
-                            contract7Present:CornerRadius="{TemplateBinding CornerRadius}"/>
-                        <ScrollBar x:Name="PART_VerticalScrollBar"
+                            Padding="{StaticResource ScrollViewScrollBarMargin}">
+                            <ScrollBar x:Name="PART_HorizontalScrollBar"
+                                Orientation="Horizontal"                                
+                                contract7Present:CornerRadius="{TemplateBinding CornerRadius}"/>
+                        </Grid>
+                        <Grid
                             Grid.Column="1"
-                            Orientation="Vertical"
-                            VerticalAlignment="Stretch"
                             Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}"
-                            contract7Present:CornerRadius="{TemplateBinding CornerRadius}"/>
+                            Padding="{StaticResource ScrollViewScrollBarMargin}">
+                            <ScrollBar x:Name="PART_VerticalScrollBar"                             
+                                Orientation="Vertical"
+                                contract7Present:CornerRadius="{TemplateBinding CornerRadius}"/>
+                        </Grid>
                         <Border x:Name="PART_ScrollBarsSeparator"
                             Grid.Row="1"
                             Grid.Column="1"