Merge pull request #275 from mou-haz/fix_195

NotYoojun · web-flow · commit bb1e9644e0ae · 2025-07-02T11:02:38.000+08:00
fix #195 pipspager animation
diff --git a/source/iNKORE.UI.WPF.Modern.Controls/Controls/Windows/PipsPager/PipsPager.cs b/source/iNKORE.UI.WPF.Modern.Controls/Controls/Windows/PipsPager/PipsPager.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
+using System.Diagnostics;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -262,15 +263,15 @@ void ScrollToCenterOfViewport(UIElement sender, int index)
                     pipSize = m_defaultPipSize.Width;
                     changeViewFunc = (double offset) =>
                     {
-                        scrollViewer.ChangeView(offset, null, null, true);
+                        scrollViewer.ChangeView(offset, null, null, false);
                     };
                 }
                 else
                 {
                     pipSize = m_defaultPipSize.Height;
                     changeViewFunc = (double offset) =>
                     {
-                        scrollViewer.ChangeView(null, offset, null, true);
+                        scrollViewer.ChangeView(null, offset, null, false);
                     };
                 }
                 int maxVisualIndicators = MaxVisiblePips;
diff --git a/source/iNKORE.UI.WPF.Modern/Controls/ScrollViewerEx.cs b/source/iNKORE.UI.WPF.Modern/Controls/ScrollViewerEx.cs
@@ -1,6 +1,7 @@
 ﻿using iNKORE.UI.WPF.Modern.Controls.Helpers;
 using iNKORE.UI.WPF.Modern.Controls.Primitives;
 using System;
+using System.Diagnostics;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Data;
@@ -285,14 +286,14 @@ public bool ChangeView(double? horizontalOffset, double? verticalOffset, float?
                 if (horizontalOffset.HasValue)
                 {
                     ScrollToHorizontalOffset(LastHorizontalLocation);
-                    AnimateScroll(horizontalOffset.Value, Orientation.Vertical, 1);
+                    AnimateScroll(Math.Min(ScrollableWidth, horizontalOffset.Value), Orientation.Horizontal, 1);
                     LastHorizontalLocation = horizontalOffset.Value;
                 }
 
                 if (verticalOffset.HasValue)
                 {
                     ScrollToVerticalOffset(LastVerticalLocation);
-                    AnimateScroll(verticalOffset.Value, Orientation.Vertical, 1);
+                    AnimateScroll(Math.Min(ScrollableHeight, verticalOffset.Value), Orientation.Vertical, 1);
                     LastVerticalLocation = verticalOffset.Value;
                 }
             }
diff --git a/source/iNKORE.UI.WPF.Modern/Themes/Controls/PipsPager.xaml b/source/iNKORE.UI.WPF.Modern/Themes/Controls/PipsPager.xaml
@@ -10,6 +10,8 @@
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="Button.xaml" />
     </ResourceDictionary.MergedDictionaries>
+    
+    <sys:Double x:Key="PipsPagerNavigationButtonScalePressed">0.875</sys:Double>
 
     <Style
         x:Key="PipsPagerNavigationButtonBaseStyle"
@@ -55,35 +57,43 @@
                             <VisualStateGroup x:Name="CommonStates">
                                 <VisualState x:Name="Normal" />
                                 <VisualState x:Name="PointerOver" />
-                                <VisualState x:Name="Pressed">
-                                    <Storyboard>
-                                        <DoubleAnimationUsingKeyFrames
-                                            RepeatBehavior="Forever"
-                                            Storyboard.TargetName="ScaleTransform"
-                                            Storyboard.TargetProperty="ScaleX">
-                                            <DiscreteDoubleKeyFrame KeyTime="0:0:0.016" Value="{DynamicResource PipsPagerNavigationButtonScalePressed}" />
-                                            <DiscreteDoubleKeyFrame KeyTime="0:0:30" Value="{DynamicResource PipsPagerNavigationButtonScalePressed}" />
-                                        </DoubleAnimationUsingKeyFrames>
-                                        <DoubleAnimationUsingKeyFrames
-                                            RepeatBehavior="Forever"
-                                            Storyboard.TargetName="ScaleTransform"
-                                            Storyboard.TargetProperty="ScaleY">
-                                            <DiscreteDoubleKeyFrame KeyTime="0:0:0.016" Value="{DynamicResource PipsPagerNavigationButtonScalePressed}" />
-                                            <DiscreteDoubleKeyFrame KeyTime="0:0:30" Value="{DynamicResource PipsPagerNavigationButtonScalePressed}" />
-                                        </DoubleAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
+                                <VisualState x:Name="Pressed"/>
                                 <VisualState x:Name="Disabled" />
                             </VisualStateGroup>
                         </VisualStateManager.VisualStateGroups>
                     </Border>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsMouseOver" Value="True">
                             <Setter TargetName="RootGrid" Property="Background" Value="{DynamicResource PipsPagerNavigationButtonBackgroundPointerOver}" />
-                            <Setter TargetName="RootGrid" Property="BorderBrush" Value="{DynamicResource PipsPagerNavigationButtonBorderBrushPressed}" />
+                            <Setter TargetName="RootGrid" Property="BorderBrush" Value="{DynamicResource PipsPagerNavigationButtonBorderBrushPointerOver}" />
                             <Setter TargetName="Content" Property="Foreground" Value="{DynamicResource PipsPagerNavigationButtonForegroundPointerOver}" />
                         </Trigger>
                         <Trigger Property="IsPressed" Value="True">
+                            <Trigger.EnterActions>
+                                <BeginStoryboard x:Name="PipsPagerButtonPressedBeginStoryboard">
+                                    <Storyboard>
+                                        <DoubleAnimationUsingKeyFrames 
+            RepeatBehavior="Forever"
+            Storyboard.TargetName="ScaleTransform" 
+            Storyboard.TargetProperty="ScaleX">
+                                            <DiscreteDoubleKeyFrame KeyTime="0:0:0.016" Value="{StaticResource PipsPagerNavigationButtonScalePressed}" />
+                                            <DiscreteDoubleKeyFrame KeyTime="0:0:30" Value="{StaticResource PipsPagerNavigationButtonScalePressed}" />
+                                        </DoubleAnimationUsingKeyFrames>
+                                        <DoubleAnimationUsingKeyFrames 
+        RepeatBehavior="Forever"
+        Storyboard.TargetName="ScaleTransform"
+        Storyboard.TargetProperty="ScaleY">
+                                            <DiscreteDoubleKeyFrame KeyTime="0:0:0.016" Value="{StaticResource PipsPagerNavigationButtonScalePressed}" />
+                                            <DiscreteDoubleKeyFrame KeyTime="0:0:30" Value="{StaticResource PipsPagerNavigationButtonScalePressed}" />
+                                        </DoubleAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </BeginStoryboard>
+                            </Trigger.EnterActions>
+
+                            <Trigger.ExitActions>
+                                <StopStoryboard BeginStoryboardName="PipsPagerButtonPressedBeginStoryboard"/>
+                            </Trigger.ExitActions>
+
                             <Setter TargetName="RootGrid" Property="Background" Value="{DynamicResource PipsPagerNavigationButtonBackgroundPressed}" />
                             <Setter TargetName="RootGrid" Property="BorderBrush" Value="{DynamicResource PipsPagerNavigationButtonBorderBrushPressed}" />
                             <Setter TargetName="Content" Property="Foreground" Value="{DynamicResource PipsPagerNavigationButtonForegroundPressed}" />

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`using System.Collections.Generic;`
`3`	`3`	`using System.Collections.ObjectModel;`
`4`	`4`	`using System.ComponentModel;`
	`5`	`+using System.Diagnostics;`
`5`	`6`	`using System.Linq;`
`6`	`7`	`using System.Text;`
`7`	`8`	`using System.Threading.Tasks;`
`@@ -262,15 +263,15 @@ void ScrollToCenterOfViewport(UIElement sender, int index)`
`262`	`263`	`pipSize = m_defaultPipSize.Width;`
`263`	`264`	`changeViewFunc = (double offset) =>`
`264`	`265`	`{`
`265`		`- scrollViewer.ChangeView(offset, null, null, true);`
	`266`	`+ scrollViewer.ChangeView(offset, null, null, false);`
`266`	`267`	`};`
`267`	`268`	`}`
`268`	`269`	`else`
`269`	`270`	`{`
`270`	`271`	`pipSize = m_defaultPipSize.Height;`
`271`	`272`	`changeViewFunc = (double offset) =>`
`272`	`273`	`{`
`273`		`- scrollViewer.ChangeView(null, offset, null, true);`
	`274`	`+ scrollViewer.ChangeView(null, offset, null, false);`
`274`	`275`	`};`
`275`	`276`	`}`
`276`	`277`	`int maxVisualIndicators = MaxVisiblePips;`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`using iNKORE.UI.WPF.Modern.Controls.Helpers;`
`2`	`2`	`using iNKORE.UI.WPF.Modern.Controls.Primitives;`
`3`	`3`	`using System;`
	`4`	`+using System.Diagnostics;`
`4`	`5`	`using System.Windows;`
`5`	`6`	`using System.Windows.Controls;`
`6`	`7`	`using System.Windows.Data;`
`@@ -285,14 +286,14 @@ public bool ChangeView(double? horizontalOffset, double? verticalOffset, float?`
`285`	`286`	`if (horizontalOffset.HasValue)`
`286`	`287`	`{`
`287`	`288`	`ScrollToHorizontalOffset(LastHorizontalLocation);`
`288`		`- AnimateScroll(horizontalOffset.Value, Orientation.Vertical, 1);`
	`289`	`+ AnimateScroll(Math.Min(ScrollableWidth, horizontalOffset.Value), Orientation.Horizontal, 1);`
`289`	`290`	`LastHorizontalLocation = horizontalOffset.Value;`
`290`	`291`	`}`
`291`	`292`
`292`	`293`	`if (verticalOffset.HasValue)`
`293`	`294`	`{`
`294`	`295`	`ScrollToVerticalOffset(LastVerticalLocation);`
`295`		`- AnimateScroll(verticalOffset.Value, Orientation.Vertical, 1);`
	`296`	`+ AnimateScroll(Math.Min(ScrollableHeight, verticalOffset.Value), Orientation.Vertical, 1);`
`296`	`297`	`LastVerticalLocation = verticalOffset.Value;`
`297`	`298`	`}`
`298`	`299`	`}`