chfei/HandyControl
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: close #1438

Browse Source
This commit is contained in:
NaBian committed 2023-07-30 16:20:07 +08:00
1 parent ff10ded92f
commit cb66005479
4 files changed
+9 -9
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
+3 -3
View File
@@ -2253,7 +2253,7 @@
</ControlTemplate.Triggers> </ControlTemplate.Triggers>
</ControlTemplate> </ControlTemplate>
<Style x:Key="ScrollViewerNativeBaseStyle" TargetType="ScrollViewer"> <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="Focusable" Value="False" />
<Setter Property="Template" Value="{StaticResource ScrollViewerNativeAutoHideBaseControlTemplate}" /> <Setter Property="Template" Value="{StaticResource ScrollViewerNativeAutoHideBaseControlTemplate}" />
<Style.Triggers> <Style.Triggers>
@@ -2349,7 +2349,7 @@
</ControlTemplate.Triggers> </ControlTemplate.Triggers>
</ControlTemplate> </ControlTemplate>
<Style x:Key="ScrollViewerBaseStyle" TargetType="hc:ScrollViewer"> <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="Focusable" Value="False" />
<Setter Property="Template" Value="{StaticResource ScrollViewerAutoHideBaseControlTemplate}" /> <Setter Property="Template" Value="{StaticResource ScrollViewerAutoHideBaseControlTemplate}" />
<Style.Triggers> <Style.Triggers>
@@ -4107,7 +4107,7 @@
</Grid> </Grid>
</ControlTemplate> </ControlTemplate>
<Style x:Key="ScrollViewerUpDown" TargetType="ScrollViewer"> <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="Focusable" Value="False" />
<Setter Property="Template" Value="{StaticResource ScrollViewerUpDownControlTemplate}" /> <Setter Property="Template" Value="{StaticResource ScrollViewerUpDownControlTemplate}" />
</Style> </Style>
src/Shared/HandyControl_Shared/Themes/Styles/Base/ScrollViewerBaseStyle.xaml
+2 -2
View File
@@ -294,7 +294,7 @@
</ControlTemplate> </ControlTemplate>
<Style x:Key="ScrollViewerNativeBaseStyle" TargetType="ScrollViewer"> <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="Focusable" Value="False"/>
<Setter Property="Template" Value="{StaticResource ScrollViewerNativeAutoHideBaseControlTemplate}"/> <Setter Property="Template" Value="{StaticResource ScrollViewerNativeAutoHideBaseControlTemplate}"/>
<Style.Triggers> <Style.Triggers>
@@ -393,7 +393,7 @@
</ControlTemplate> </ControlTemplate>
<Style x:Key="ScrollViewerBaseStyle" TargetType="hc:ScrollViewer"> <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="Focusable" Value="False"/>
<Setter Property="Template" Value="{StaticResource ScrollViewerAutoHideBaseControlTemplate}"/> <Setter Property="Template" Value="{StaticResource ScrollViewerAutoHideBaseControlTemplate}"/>
<Style.Triggers> <Style.Triggers>
src/Shared/HandyControl_Shared/Themes/Styles/ScrollViewer.xaml
+1 -1
View File
@@ -47,7 +47,7 @@
</ControlTemplate> </ControlTemplate>
<Style x:Key="ScrollViewerUpDown" TargetType="ScrollViewer"> <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="Focusable" Value="False"/>
<Setter Property="Template" Value="{StaticResource ScrollViewerUpDownControlTemplate}"/> <Setter Property="Template" Value="{StaticResource ScrollViewerUpDownControlTemplate}"/>
</Style> </Style>
src/Shared/HandyControl_Shared/Themes/Theme.xaml
+3 -3
View File
@@ -2253,7 +2253,7 @@
</ControlTemplate.Triggers> </ControlTemplate.Triggers>
</ControlTemplate> </ControlTemplate>
<Style x:Key="ScrollViewerNativeBaseStyle" TargetType="ScrollViewer"> <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="Focusable" Value="False" />
<Setter Property="Template" Value="{StaticResource ScrollViewerNativeAutoHideBaseControlTemplate}" /> <Setter Property="Template" Value="{StaticResource ScrollViewerNativeAutoHideBaseControlTemplate}" />
<Style.Triggers> <Style.Triggers>
@@ -2349,7 +2349,7 @@
</ControlTemplate.Triggers> </ControlTemplate.Triggers>
</ControlTemplate> </ControlTemplate>
<Style x:Key="ScrollViewerBaseStyle" TargetType="hc:ScrollViewer"> <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="Focusable" Value="False" />
<Setter Property="Template" Value="{StaticResource ScrollViewerAutoHideBaseControlTemplate}" /> <Setter Property="Template" Value="{StaticResource ScrollViewerAutoHideBaseControlTemplate}" />
<Style.Triggers> <Style.Triggers>
@@ -4107,7 +4107,7 @@
</Grid> </Grid>
</ControlTemplate> </ControlTemplate>
<Style x:Key="ScrollViewerUpDown" TargetType="ScrollViewer"> <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="Focusable" Value="False" />
<Setter Property="Template" Value="{StaticResource ScrollViewerUpDownControlTemplate}" /> <Setter Property="Template" Value="{StaticResource ScrollViewerUpDownControlTemplate}" />
</Style> </Style>