Merge pull request #388 from dotnet-campus/t/walterlv/trigger

使用 Trigger 替代 DataTrigger
HandyOrg · May 26, 2020 · 1afe3ab · 1afe3ab
2 parents 1e17137 + 4df5249
commit 1afe3ab
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/ScrollViewerBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/ScrollViewerBaseStyle.xaml
@@ -237,14 +237,14 @@
             <ScrollBar x:Name="PART_HorizontalScrollBar" Opacity="0" Style="{StaticResource ScrollBarBaseStyle}" AutomationProperties.AutomationId="HorizontalScrollBar" Cursor="Arrow" Grid.Column="0" Maximum="{TemplateBinding ScrollableWidth}" Minimum="0" Orientation="Horizontal" Grid.Row="1" Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}" Value="{Binding HorizontalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportWidth}"/>
         </Grid>
         <ControlTemplate.Triggers>
-            <DataTrigger Binding="{Binding IsMouseOver,RelativeSource={RelativeSource Self}}" Value="True">
-                <DataTrigger.EnterActions>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Trigger.EnterActions>
                     <BeginStoryboard Storyboard="{StaticResource Storyboard1}"/>
-                </DataTrigger.EnterActions>
-                <DataTrigger.ExitActions>
+                </Trigger.EnterActions>
+                <Trigger.ExitActions>
                     <BeginStoryboard Storyboard="{StaticResource Storyboard2}"/>
-                </DataTrigger.ExitActions>
-            </DataTrigger>
+                </Trigger.ExitActions>
+            </Trigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
 
@@ -287,14 +287,14 @@
             <ScrollBar x:Name="PART_HorizontalScrollBar" Opacity="0" Style="{StaticResource ScrollBarBaseStyle}" AutomationProperties.AutomationId="HorizontalScrollBar" Cursor="Arrow" Grid.Column="0" Maximum="{TemplateBinding ScrollableWidth}" Minimum="0" Orientation="Horizontal" Grid.Row="1" Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}" Value="{Binding HorizontalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" ViewportSize="{TemplateBinding ViewportWidth}"/>
         </Grid>
         <ControlTemplate.Triggers>
-            <DataTrigger Binding="{Binding IsMouseOver,RelativeSource={RelativeSource Self}}" Value="True">
-                <DataTrigger.EnterActions>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Trigger.EnterActions>
                     <BeginStoryboard Storyboard="{StaticResource Storyboard1}"/>
-                </DataTrigger.EnterActions>
-                <DataTrigger.ExitActions>
+                </Trigger.EnterActions>
+                <Trigger.ExitActions>
                     <BeginStoryboard Storyboard="{StaticResource Storyboard2}"/>
-                </DataTrigger.ExitActions>
-            </DataTrigger>
+                </Trigger.ExitActions>
+            </Trigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>