From 3347048899e51ec89071add455b95175a4951118 Mon Sep 17 00:00:00 2001 From: Regis Brid Date: Wed, 10 Mar 2021 18:02:15 -0800 Subject: [PATCH 1/5] Workaround for Issue #4255 --- .../ScrollBar_themeresources.xaml | 2 -- dev/ScrollView/ScrollView.xaml | 22 ++++++++++++------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/dev/CommonStyles/ScrollBar_themeresources.xaml b/dev/CommonStyles/ScrollBar_themeresources.xaml index ea7e6a15ab..0deeb7320f 100755 --- a/dev/CommonStyles/ScrollBar_themeresources.xaml +++ b/dev/CommonStyles/ScrollBar_themeresources.xaml @@ -187,7 +187,6 @@ 00:00:02 00:00:02.1 12 - 1 30 8 @@ -213,7 +212,6 @@ diff --git a/dev/CommonStyles/ScrollViewer_themeresources_v1.xaml b/dev/CommonStyles/ScrollViewer_themeresources_v1.xaml new file mode 100644 index 0000000000..3a63d9618d --- /dev/null +++ b/dev/CommonStyles/ScrollViewer_themeresources_v1.xaml @@ -0,0 +1,255 @@ + + + + + + + + + + + + + + + + diff --git a/dev/ScrollView/ScrollView.xaml b/dev/ScrollView/ScrollView.xaml index 11bd0f0dfc..abc34acfcb 100644 --- a/dev/ScrollView/ScrollView.xaml +++ b/dev/ScrollView/ScrollView.xaml @@ -6,8 +6,6 @@ xmlns:localPrimitives="using:Microsoft.UI.Xaml.Controls.Primitives" xmlns:contract7Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,7)"> - 1 -