From cb660054792ba9a3d9a660ec9a2deac75f321513 Mon Sep 17 00:00:00 2001
From: NaBian <836904362@qq.com>
Date: Sun, 30 Jul 2023 16:20:07 +0800
Subject: [PATCH] fix: close #1438

---
 src/Net_40/HandyControl_Net_40/Themes/Theme.xaml            | 6 +++---
 .../Themes/Styles/Base/ScrollViewerBaseStyle.xaml           | 4 ++--
 .../HandyControl_Shared/Themes/Styles/ScrollViewer.xaml     | 2 +-
 src/Shared/HandyControl_Shared/Themes/Theme.xaml            | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml b/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
index b5dfb11b..d39ee134 100644
--- a/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
+++ b/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
@@ -2253,7 +2253,7 @@
 		</ControlTemplate.Triggers>
 	</ControlTemplate>
 	<Style x:Key="ScrollViewerNativeBaseStyle" TargetType="ScrollViewer">
-		<Setter Property="VerticalScrollBarVisibility" Value="Auto" />
+		<Setter Property="VerticalScrollBarVisibility" Value="{Binding Path=(hc:ScrollViewer.VerticalScrollBarVisibility),RelativeSource={RelativeSource TemplatedParent}}" />
 		<Setter Property="Focusable" Value="False" />
 		<Setter Property="Template" Value="{StaticResource ScrollViewerNativeAutoHideBaseControlTemplate}" />
 		<Style.Triggers>
@@ -2349,7 +2349,7 @@
 		</ControlTemplate.Triggers>
 	</ControlTemplate>
 	<Style x:Key="ScrollViewerBaseStyle" TargetType="hc:ScrollViewer">
-		<Setter Property="VerticalScrollBarVisibility" Value="Auto" />
+		<Setter Property="VerticalScrollBarVisibility" Value="{Binding Path=(hc:ScrollViewer.VerticalScrollBarVisibility),RelativeSource={RelativeSource TemplatedParent}}" />
 		<Setter Property="Focusable" Value="False" />
 		<Setter Property="Template" Value="{StaticResource ScrollViewerAutoHideBaseControlTemplate}" />
 		<Style.Triggers>
@@ -4107,7 +4107,7 @@
 		</Grid>
 	</ControlTemplate>
 	<Style x:Key="ScrollViewerUpDown" TargetType="ScrollViewer">
-		<Setter Property="VerticalScrollBarVisibility" Value="Auto" />
+		<Setter Property="VerticalScrollBarVisibility" Value="{Binding Path=(hc:ScrollViewer.VerticalScrollBarVisibility),RelativeSource={RelativeSource TemplatedParent}}" />
 		<Setter Property="Focusable" Value="False" />
 		<Setter Property="Template" Value="{StaticResource ScrollViewerUpDownControlTemplate}" />
 	</Style>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ScrollViewerBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ScrollViewerBaseStyle.xaml
index 8965a84e..65f65b86 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ScrollViewerBaseStyle.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ScrollViewerBaseStyle.xaml
@@ -294,7 +294,7 @@
     </ControlTemplate>
 
     <Style x:Key="ScrollViewerNativeBaseStyle" TargetType="ScrollViewer">
-        <Setter Property="VerticalScrollBarVisibility" Value="Auto"/>
+        <Setter Property="VerticalScrollBarVisibility" Value="{Binding Path=(hc:ScrollViewer.VerticalScrollBarVisibility),RelativeSource={RelativeSource TemplatedParent}}"/>
         <Setter Property="Focusable" Value="False"/>
         <Setter Property="Template" Value="{StaticResource ScrollViewerNativeAutoHideBaseControlTemplate}"/>
         <Style.Triggers>
@@ -393,7 +393,7 @@
     </ControlTemplate>
     
     <Style x:Key="ScrollViewerBaseStyle" TargetType="hc:ScrollViewer">
-        <Setter Property="VerticalScrollBarVisibility" Value="Auto"/>
+        <Setter Property="VerticalScrollBarVisibility" Value="{Binding Path=(hc:ScrollViewer.VerticalScrollBarVisibility),RelativeSource={RelativeSource TemplatedParent}}" />
         <Setter Property="Focusable" Value="False"/>
         <Setter Property="Template" Value="{StaticResource ScrollViewerAutoHideBaseControlTemplate}"/>
         <Style.Triggers>
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/ScrollViewer.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/ScrollViewer.xaml
index 1d3e56cc..2e114aa4 100644
--- a/src/Shared/HandyControl_Shared/Themes/Styles/ScrollViewer.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Styles/ScrollViewer.xaml
@@ -47,7 +47,7 @@
     </ControlTemplate>
     
     <Style x:Key="ScrollViewerUpDown" TargetType="ScrollViewer">
-        <Setter Property="VerticalScrollBarVisibility" Value="Auto"/>
+        <Setter Property="VerticalScrollBarVisibility" Value="{Binding Path=(hc:ScrollViewer.VerticalScrollBarVisibility),RelativeSource={RelativeSource TemplatedParent}}" />
         <Setter Property="Focusable" Value="False"/>
         <Setter Property="Template" Value="{StaticResource ScrollViewerUpDownControlTemplate}"/>
     </Style>
diff --git a/src/Shared/HandyControl_Shared/Themes/Theme.xaml b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
index 47690fbd..68142ab4 100644
--- a/src/Shared/HandyControl_Shared/Themes/Theme.xaml
+++ b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
@@ -2253,7 +2253,7 @@
 		</ControlTemplate.Triggers>
 	</ControlTemplate>
 	<Style x:Key="ScrollViewerNativeBaseStyle" TargetType="ScrollViewer">
-		<Setter Property="VerticalScrollBarVisibility" Value="Auto" />
+		<Setter Property="VerticalScrollBarVisibility" Value="{Binding Path=(hc:ScrollViewer.VerticalScrollBarVisibility),RelativeSource={RelativeSource TemplatedParent}}" />
 		<Setter Property="Focusable" Value="False" />
 		<Setter Property="Template" Value="{StaticResource ScrollViewerNativeAutoHideBaseControlTemplate}" />
 		<Style.Triggers>
@@ -2349,7 +2349,7 @@
 		</ControlTemplate.Triggers>
 	</ControlTemplate>
 	<Style x:Key="ScrollViewerBaseStyle" TargetType="hc:ScrollViewer">
-		<Setter Property="VerticalScrollBarVisibility" Value="Auto" />
+		<Setter Property="VerticalScrollBarVisibility" Value="{Binding Path=(hc:ScrollViewer.VerticalScrollBarVisibility),RelativeSource={RelativeSource TemplatedParent}}" />
 		<Setter Property="Focusable" Value="False" />
 		<Setter Property="Template" Value="{StaticResource ScrollViewerAutoHideBaseControlTemplate}" />
 		<Style.Triggers>
@@ -4107,7 +4107,7 @@
 		</Grid>
 	</ControlTemplate>
 	<Style x:Key="ScrollViewerUpDown" TargetType="ScrollViewer">
-		<Setter Property="VerticalScrollBarVisibility" Value="Auto" />
+		<Setter Property="VerticalScrollBarVisibility" Value="{Binding Path=(hc:ScrollViewer.VerticalScrollBarVisibility),RelativeSource={RelativeSource TemplatedParent}}" />
 		<Setter Property="Focusable" Value="False" />
 		<Setter Property="Template" Value="{StaticResource ScrollViewerUpDownControlTemplate}" />
 	</Style>