From fe8df2a1566a21cf57ef9e300ce32ab0b36a7927 Mon Sep 17 00:00:00 2001
From: Andres Pineda <pineda.andres@gmail.com>
Date: Wed, 6 Apr 2022 21:47:58 -0400
Subject: [PATCH] chore: (FlipView) remove property from style

---
 .../PriorityDefault/FlipView_themeresources.xaml      |  1 -
 src/Uno.UI.FluentTheme.v1/themeresources_v1.xaml      |  2 +-
 .../PriorityDefault/FlipView_themeresources.xaml      | 11 +++++------
 src/Uno.UI.FluentTheme.v2/themeresources_v2.xaml      |  2 +-
 src/Uno.UI/UI/Xaml/Style/Generic/Generic.xaml         |  1 -
 src/Uno.UI/UI/Xaml/Style/mergedstyles.xaml            |  2 +-
 6 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/Uno.UI.FluentTheme.v1/Resources/Version1/PriorityDefault/FlipView_themeresources.xaml b/src/Uno.UI.FluentTheme.v1/Resources/Version1/PriorityDefault/FlipView_themeresources.xaml
index 265d350dbc7b..3b1edbdb5a49 100644
--- a/src/Uno.UI.FluentTheme.v1/Resources/Version1/PriorityDefault/FlipView_themeresources.xaml
+++ b/src/Uno.UI.FluentTheme.v1/Resources/Version1/PriorityDefault/FlipView_themeresources.xaml
@@ -320,7 +320,6 @@
                             ZoomMode="Disabled"
                             TabNavigation="{TemplateBinding TabNavigation}"
                             IsTabStop="False"
-                            ForceChangeToCurrentView="True"
                             AutomationProperties.AccessibilityView="Raw">
                             <ItemsPresenter />
                         </ScrollViewer>
diff --git a/src/Uno.UI.FluentTheme.v1/themeresources_v1.xaml b/src/Uno.UI.FluentTheme.v1/themeresources_v1.xaml
index 1b1b71084a09..b4c9f0d8785c 100644
--- a/src/Uno.UI.FluentTheme.v1/themeresources_v1.xaml
+++ b/src/Uno.UI.FluentTheme.v1/themeresources_v1.xaml
@@ -13315,7 +13315,7 @@
                 </Border>
               </ControlTemplate>
             </Grid.Resources>
-            <ScrollViewer x:Name="ScrollingHost" VerticalSnapPointsType="MandatorySingle" HorizontalSnapPointsType="MandatorySingle" HorizontalScrollMode="{TemplateBinding ScrollViewer.HorizontalScrollMode}" HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}" VerticalScrollMode="{TemplateBinding ScrollViewer.VerticalScrollMode}" VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}" IsHorizontalRailEnabled="{TemplateBinding ScrollViewer.IsHorizontalRailEnabled}" IsVerticalRailEnabled="{TemplateBinding ScrollViewer.IsVerticalRailEnabled}" IsHorizontalScrollChainingEnabled="{TemplateBinding ScrollViewer.IsHorizontalScrollChainingEnabled}" IsVerticalScrollChainingEnabled="{TemplateBinding ScrollViewer.IsVerticalScrollChainingEnabled}" IsDeferredScrollingEnabled="{TemplateBinding ScrollViewer.IsDeferredScrollingEnabled}" BringIntoViewOnFocusChange="{TemplateBinding ScrollViewer.BringIntoViewOnFocusChange}" Padding="{TemplateBinding Padding}" ZoomMode="Disabled" TabNavigation="{TemplateBinding TabNavigation}" IsTabStop="False" ForceChangeToCurrentView="True" AutomationProperties.AccessibilityView="Raw">
+            <ScrollViewer x:Name="ScrollingHost" VerticalSnapPointsType="MandatorySingle" HorizontalSnapPointsType="MandatorySingle" HorizontalScrollMode="{TemplateBinding ScrollViewer.HorizontalScrollMode}" HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}" VerticalScrollMode="{TemplateBinding ScrollViewer.VerticalScrollMode}" VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}" IsHorizontalRailEnabled="{TemplateBinding ScrollViewer.IsHorizontalRailEnabled}" IsVerticalRailEnabled="{TemplateBinding ScrollViewer.IsVerticalRailEnabled}" IsHorizontalScrollChainingEnabled="{TemplateBinding ScrollViewer.IsHorizontalScrollChainingEnabled}" IsVerticalScrollChainingEnabled="{TemplateBinding ScrollViewer.IsVerticalScrollChainingEnabled}" IsDeferredScrollingEnabled="{TemplateBinding ScrollViewer.IsDeferredScrollingEnabled}" BringIntoViewOnFocusChange="{TemplateBinding ScrollViewer.BringIntoViewOnFocusChange}" Padding="{TemplateBinding Padding}" ZoomMode="Disabled" TabNavigation="{TemplateBinding TabNavigation}" IsTabStop="False" AutomationProperties.AccessibilityView="Raw">
               <ItemsPresenter />
             </ScrollViewer>
             <Button x:Name="PreviousButtonHorizontal" Template="{StaticResource HorizontalPreviousTemplate}" Width="20" Height="36" CornerRadius="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource RightCornerRadiusFilterConverter}}" IsTabStop="False" UseSystemFocusVisuals="False" HorizontalAlignment="Left" VerticalAlignment="Center" />
diff --git a/src/Uno.UI.FluentTheme.v2/Resources/Version2/PriorityDefault/FlipView_themeresources.xaml b/src/Uno.UI.FluentTheme.v2/Resources/Version2/PriorityDefault/FlipView_themeresources.xaml
index 571fd724c9be..6d4269d58b57 100644
--- a/src/Uno.UI.FluentTheme.v2/Resources/Version2/PriorityDefault/FlipView_themeresources.xaml
+++ b/src/Uno.UI.FluentTheme.v2/Resources/Version2/PriorityDefault/FlipView_themeresources.xaml
@@ -14,15 +14,15 @@
         <ResourceDictionary x:Key="Default">
             <Thickness x:Key="FlipViewButtonBorderThemeThickness">0</Thickness>
             <StaticResource x:Key="FlipViewBackground" ResourceKey="SolidBackgroundFillColorBaseBrush" />
-            
+
             <StaticResource x:Key="FlipViewNextPreviousButtonBackground" ResourceKey="AcrylicInAppFillColorDefaultBrush" />
             <StaticResource x:Key="FlipViewNextPreviousButtonBackgroundPointerOver" ResourceKey="AcrylicInAppFillColorDefaultBrush" />
             <StaticResource x:Key="FlipViewNextPreviousButtonBackgroundPressed" ResourceKey="AcrylicInAppFillColorDefaultBrush" />
-            
+
             <StaticResource x:Key="FlipViewNextPreviousArrowForeground" ResourceKey="ControlStrongFillColorDefaultBrush" />
             <StaticResource x:Key="FlipViewNextPreviousArrowForegroundPointerOver" ResourceKey="TextFillColorSecondaryBrush" />
             <StaticResource x:Key="FlipViewNextPreviousArrowForegroundPressed" ResourceKey="TextFillColorSecondaryBrush" />
-            
+
             <StaticResource x:Key="FlipViewNextPreviousButtonBorderBrush" ResourceKey="ControlStrokeColorDefaultBrush" />
             <StaticResource x:Key="FlipViewNextPreviousButtonBorderBrushPointerOver" ResourceKey="ControlStrokeColorDefaultBrush" />
             <StaticResource x:Key="FlipViewNextPreviousButtonBorderBrushPressed" ResourceKey="ControlStrokeColorDefaultBrush" />
@@ -71,7 +71,7 @@
             <StaticResource x:Key="FlipViewNextPreviousArrowForeground" ResourceKey="ControlStrongFillColorDefaultBrush" />
             <StaticResource x:Key="FlipViewNextPreviousArrowForegroundPointerOver" ResourceKey="TextFillColorSecondaryBrush" />
             <StaticResource x:Key="FlipViewNextPreviousArrowForegroundPressed" ResourceKey="TextFillColorSecondaryBrush" />
-            
+
             <StaticResource x:Key="FlipViewNextPreviousButtonBorderBrush" ResourceKey="ControlStrokeColorDefaultBrush" />
             <StaticResource x:Key="FlipViewNextPreviousButtonBorderBrushPointerOver" ResourceKey="ControlStrokeColorDefaultBrush" />
             <StaticResource x:Key="FlipViewNextPreviousButtonBorderBrushPressed" ResourceKey="ControlStrokeColorDefaultBrush" />
@@ -91,7 +91,7 @@
 
     <x:Double x:Key="FlipViewButtonFontSize">8</x:Double>
     <x:Double x:Key="FlipViewButtonScalePressed">0.875</x:Double>
-    
+
 	<!-- UNO TODO Currently only style using native flip view control is supported on Android and iOS-->
     <!-- <Style TargetType="FlipView" BasedOn="{StaticResource DefaultFlipViewStyle}" /> -->
 	<wasm:Style TargetType="FlipView" BasedOn="{StaticResource DefaultFlipViewStyle}" />
@@ -394,7 +394,6 @@
                             ZoomMode="Disabled"
                             TabNavigation="{TemplateBinding TabNavigation}"
                             IsTabStop="False"
-							ForceChangeToCurrentView="True"
                             AutomationProperties.AccessibilityView="Raw">
                             <ItemsPresenter />
                         </ScrollViewer>
diff --git a/src/Uno.UI.FluentTheme.v2/themeresources_v2.xaml b/src/Uno.UI.FluentTheme.v2/themeresources_v2.xaml
index 71fa1edb56ad..387d9ea8484b 100644
--- a/src/Uno.UI.FluentTheme.v2/themeresources_v2.xaml
+++ b/src/Uno.UI.FluentTheme.v2/themeresources_v2.xaml
@@ -16297,7 +16297,7 @@
                 </Border>
               </ControlTemplate>
             </Grid.Resources>
-            <ScrollViewer x:Name="ScrollingHost" VerticalSnapPointsType="MandatorySingle" HorizontalSnapPointsType="MandatorySingle" HorizontalScrollMode="{TemplateBinding ScrollViewer.HorizontalScrollMode}" HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}" VerticalScrollMode="{TemplateBinding ScrollViewer.VerticalScrollMode}" VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}" IsHorizontalRailEnabled="{TemplateBinding ScrollViewer.IsHorizontalRailEnabled}" IsVerticalRailEnabled="{TemplateBinding ScrollViewer.IsVerticalRailEnabled}" IsHorizontalScrollChainingEnabled="{TemplateBinding ScrollViewer.IsHorizontalScrollChainingEnabled}" IsVerticalScrollChainingEnabled="{TemplateBinding ScrollViewer.IsVerticalScrollChainingEnabled}" IsDeferredScrollingEnabled="{TemplateBinding ScrollViewer.IsDeferredScrollingEnabled}" BringIntoViewOnFocusChange="{TemplateBinding ScrollViewer.BringIntoViewOnFocusChange}" Padding="{TemplateBinding Padding}" ZoomMode="Disabled" TabNavigation="{TemplateBinding TabNavigation}" IsTabStop="False" ForceChangeToCurrentView="True" AutomationProperties.AccessibilityView="Raw">
+            <ScrollViewer x:Name="ScrollingHost" VerticalSnapPointsType="MandatorySingle" HorizontalSnapPointsType="MandatorySingle" HorizontalScrollMode="{TemplateBinding ScrollViewer.HorizontalScrollMode}" HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}" VerticalScrollMode="{TemplateBinding ScrollViewer.VerticalScrollMode}" VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}" IsHorizontalRailEnabled="{TemplateBinding ScrollViewer.IsHorizontalRailEnabled}" IsVerticalRailEnabled="{TemplateBinding ScrollViewer.IsVerticalRailEnabled}" IsHorizontalScrollChainingEnabled="{TemplateBinding ScrollViewer.IsHorizontalScrollChainingEnabled}" IsVerticalScrollChainingEnabled="{TemplateBinding ScrollViewer.IsVerticalScrollChainingEnabled}" IsDeferredScrollingEnabled="{TemplateBinding ScrollViewer.IsDeferredScrollingEnabled}" BringIntoViewOnFocusChange="{TemplateBinding ScrollViewer.BringIntoViewOnFocusChange}" Padding="{TemplateBinding Padding}" ZoomMode="Disabled" TabNavigation="{TemplateBinding TabNavigation}" IsTabStop="False" AutomationProperties.AccessibilityView="Raw">
               <ItemsPresenter />
             </ScrollViewer>
             <Button x:Name="PreviousButtonHorizontal" Template="{StaticResource HorizontalPreviousTemplate}" Width="16" Height="38" Margin="1" contract7Present:CornerRadius="{TemplateBinding CornerRadius}" IsTabStop="False" UseSystemFocusVisuals="False" HorizontalAlignment="Left" VerticalAlignment="Center" />
diff --git a/src/Uno.UI/UI/Xaml/Style/Generic/Generic.xaml b/src/Uno.UI/UI/Xaml/Style/Generic/Generic.xaml
index da8d63fe3402..831ac7d5a33d 100644
--- a/src/Uno.UI/UI/Xaml/Style/Generic/Generic.xaml
+++ b/src/Uno.UI/UI/Xaml/Style/Generic/Generic.xaml
@@ -7943,7 +7943,6 @@
 									  ZoomMode="Disabled"
 									  TabNavigation="{TemplateBinding TabNavigation}"
 									  IsTabStop="False"
-									  ForceChangeToCurrentView="True"
 									  AutomationProperties.AccessibilityView="Raw">
 							<ItemsPresenter />
 						</ScrollViewer>
diff --git a/src/Uno.UI/UI/Xaml/Style/mergedstyles.xaml b/src/Uno.UI/UI/Xaml/Style/mergedstyles.xaml
index c5a60b0dd045..991570d4c086 100644
--- a/src/Uno.UI/UI/Xaml/Style/mergedstyles.xaml
+++ b/src/Uno.UI/UI/Xaml/Style/mergedstyles.xaml
@@ -18708,7 +18708,7 @@
                 </Border>
               </ControlTemplate>
             </Grid.Resources>
-            <ScrollViewer x:Name="ScrollingHost" VerticalSnapPointsType="MandatorySingle" HorizontalSnapPointsType="MandatorySingle" HorizontalScrollMode="{TemplateBinding ScrollViewer.HorizontalScrollMode}" HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}" VerticalScrollMode="{TemplateBinding ScrollViewer.VerticalScrollMode}" VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}" IsHorizontalRailEnabled="{TemplateBinding ScrollViewer.IsHorizontalRailEnabled}" IsVerticalRailEnabled="{TemplateBinding ScrollViewer.IsVerticalRailEnabled}" IsHorizontalScrollChainingEnabled="{TemplateBinding ScrollViewer.IsHorizontalScrollChainingEnabled}" IsVerticalScrollChainingEnabled="{TemplateBinding ScrollViewer.IsVerticalScrollChainingEnabled}" IsDeferredScrollingEnabled="{TemplateBinding ScrollViewer.IsDeferredScrollingEnabled}" BringIntoViewOnFocusChange="{TemplateBinding ScrollViewer.BringIntoViewOnFocusChange}" Padding="{TemplateBinding Padding}" ZoomMode="Disabled" TabNavigation="{TemplateBinding TabNavigation}" IsTabStop="False" ForceChangeToCurrentView="True" AutomationProperties.AccessibilityView="Raw">
+            <ScrollViewer x:Name="ScrollingHost" VerticalSnapPointsType="MandatorySingle" HorizontalSnapPointsType="MandatorySingle" HorizontalScrollMode="{TemplateBinding ScrollViewer.HorizontalScrollMode}" HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}" VerticalScrollMode="{TemplateBinding ScrollViewer.VerticalScrollMode}" VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}" IsHorizontalRailEnabled="{TemplateBinding ScrollViewer.IsHorizontalRailEnabled}" IsVerticalRailEnabled="{TemplateBinding ScrollViewer.IsVerticalRailEnabled}" IsHorizontalScrollChainingEnabled="{TemplateBinding ScrollViewer.IsHorizontalScrollChainingEnabled}" IsVerticalScrollChainingEnabled="{TemplateBinding ScrollViewer.IsVerticalScrollChainingEnabled}" IsDeferredScrollingEnabled="{TemplateBinding ScrollViewer.IsDeferredScrollingEnabled}" BringIntoViewOnFocusChange="{TemplateBinding ScrollViewer.BringIntoViewOnFocusChange}" Padding="{TemplateBinding Padding}" ZoomMode="Disabled" TabNavigation="{TemplateBinding TabNavigation}" IsTabStop="False" AutomationProperties.AccessibilityView="Raw">
               <ItemsPresenter />
             </ScrollViewer>
             <Button x:Name="PreviousButtonHorizontal" Template="{StaticResource HorizontalPreviousTemplate}" Width="20" Height="36" IsTabStop="False" UseSystemFocusVisuals="False" HorizontalAlignment="Left" AutomationProperties.Name="PreviousButtonHorizontal" VerticalAlignment="Center" />