From f2b6328b973bd95dcdf0ffeff41dad562aec6d5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9E=AB=E9=9B=A8?= <737345039@qq.com>
Date: Tue, 18 Apr 2023 22:28:05 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E7=BA=B5=E5=90=91=E4=B8=9D=E6=BB=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/MaaWpfGui/Views/UI/CopilotView.xaml               |  5 +++--
 src/MaaWpfGui/Views/UI/RecognizerView.xaml            | 11 +++++++----
 src/MaaWpfGui/Views/UI/SettingsView.xaml              |  6 ++++--
 src/MaaWpfGui/Views/UI/TaskQueueView.xaml             |  5 +++--
 src/MaaWpfGui/Views/UI/VersionUpdateView.xaml         |  5 ++++-
 .../Views/UserControl/FightSettingsUserControl.xaml   |  5 +++--
 6 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/src/MaaWpfGui/Views/UI/CopilotView.xaml b/src/MaaWpfGui/Views/UI/CopilotView.xaml
index 9064592603..d4ce34a5f5 100644
--- a/src/MaaWpfGui/Views/UI/CopilotView.xaml
+++ b/src/MaaWpfGui/Views/UI/CopilotView.xaml
@@ -118,9 +118,10 @@
                 <RowDefinition />
                 <RowDefinition Height="Auto" />
             </Grid.RowDefinitions>
-            <ScrollViewer
+            <hc:ScrollViewer
                 Width="360"
                 Margin="0,10"
+                IsInertiaEnabled="True"
                 properties:AutoScroll.AutoScroll="True"
                 HorizontalScrollBarVisibility="Disabled">
                 <ItemsControl ItemsSource="{Binding Path=LogItemViewModels}">
@@ -138,7 +139,7 @@
                         </DataTemplate>
                     </ItemsControl.ItemTemplate>
                 </ItemsControl>
-            </ScrollViewer>
+            </hc:ScrollViewer>
             <StackPanel
                 Grid.Row="1"
                 HorizontalAlignment="Center"
diff --git a/src/MaaWpfGui/Views/UI/RecognizerView.xaml b/src/MaaWpfGui/Views/UI/RecognizerView.xaml
index fc39839902..fb1feaae52 100644
--- a/src/MaaWpfGui/Views/UI/RecognizerView.xaml
+++ b/src/MaaWpfGui/Views/UI/RecognizerView.xaml
@@ -11,6 +11,7 @@
     xmlns:ui="clr-namespace:MaaWpfGui.ViewModels.UI"
     xmlns:viewModels="clr-namespace:MaaWpfGui.ViewModels"
     xmlns:vm="clr-namespace:MaaWpfGui"
+    xmlns:hc="https://handyorg.github.io/handycontrol"
     d:DataContext="{d:DesignInstance {x:Type ui:RecognizerViewModel}}"
     d:DesignHeight="1200"
     d:DesignWidth="800"
@@ -41,9 +42,10 @@
                 <RowDefinition Height="*" />
                 <RowDefinition Height="150" />
             </Grid.RowDefinitions>
-            <ScrollViewer
+            <hc:ScrollViewer
                 Grid.Row="0"
                 Margin="10,0"
+                IsInertiaEnabled="True"
                 VerticalAlignment="Top">
                 <StackPanel>
                     <controls:TextBlock
@@ -62,7 +64,7 @@
                         Text="{Binding RecruitResult}"
                         TextWrapping="Wrap" />
                 </StackPanel>
-            </ScrollViewer>
+            </hc:ScrollViewer>
             <StackPanel
                 Grid.Row="1"
                 Margin="27,0"
@@ -130,9 +132,10 @@
                 <RowDefinition Height="*" />
                 <RowDefinition Height="150" />
             </Grid.RowDefinitions>
-            <ScrollViewer
+            <hc:ScrollViewer
                 Grid.Row="0"
                 Margin="10,0"
+                IsInertiaEnabled="True"
                 VerticalAlignment="Top">
                 <StackPanel>
                     <controls:TextBlock
@@ -151,7 +154,7 @@
                         Text="{Binding DepotResult}"
                         TextWrapping="Wrap" />
                 </StackPanel>
-            </ScrollViewer>
+            </hc:ScrollViewer>
             <StackPanel
                 Grid.Row="1"
                 Margin="27,0"
diff --git a/src/MaaWpfGui/Views/UI/SettingsView.xaml b/src/MaaWpfGui/Views/UI/SettingsView.xaml
index 6aa1d6a858..1e46f57f15 100644
--- a/src/MaaWpfGui/Views/UI/SettingsView.xaml
+++ b/src/MaaWpfGui/Views/UI/SettingsView.xaml
@@ -15,6 +15,7 @@
     xmlns:styles="clr-namespace:MaaWpfGui.Styles"
     xmlns:properties="clr-namespace:MaaWpfGui.Styles.Properties"
     xmlns:controls="clr-namespace:MaaWpfGui.Styles.Controls"
+    xmlns:hc="https://handyorg.github.io/handycontrol"
     d:DataContext="{d:DesignInstance {x:Type ui:SettingsViewModel}}"
     d:DesignHeight="3000"
     d:DesignWidth="800"
@@ -32,9 +33,10 @@
             ItemsSource="{Binding ListTitle}"
             SelectedIndex="{Binding SelectedIndex}" />
 
-        <ScrollViewer
+        <hc:ScrollViewer
             Grid.Column="1"
             Margin="20,10"
+            IsInertiaEnabled="True"
             HorizontalAlignment="Stretch"
             properties:ScrollViewerBinding.ExtentHeight="{Binding ScrollExtentHeight}"
             properties:ScrollViewerBinding.RectangleVerticalOffsetList="{Binding RectangleVerticalOffsetList}"
@@ -207,6 +209,6 @@
                 <userControl:AboutUserControl Margin="20" HorizontalAlignment="Center" />
                 <!--<Rectangle HorizontalAlignment="Stretch" Fill="{DynamicResource BorderBrush}" Height="1" />-->
             </StackPanel>
-        </ScrollViewer>
+        </hc:ScrollViewer>
     </Grid>
 </UserControl>
diff --git a/src/MaaWpfGui/Views/UI/TaskQueueView.xaml b/src/MaaWpfGui/Views/UI/TaskQueueView.xaml
index c163fad1d2..4f42fda4c9 100644
--- a/src/MaaWpfGui/Views/UI/TaskQueueView.xaml
+++ b/src/MaaWpfGui/Views/UI/TaskQueueView.xaml
@@ -187,9 +187,10 @@
 
         <!--<GridSplitter Grid.Column="2" Width="5" HorizontalAlignment="Stretch" />-->
         <!--<Rectangle Grid.Column="2" VerticalAlignment="Stretch" Fill="{DynamicResource BorderBrush}" Width="4" />-->
-        <ScrollViewer
+        <hc:ScrollViewer
             Grid.Column="2"
             Margin="10"
+            IsInertiaEnabled="True"
             HorizontalAlignment="Stretch"
             VerticalAlignment="Top"
             properties:AutoScroll.AutoScroll="True"
@@ -220,6 +221,6 @@
                     </DataTemplate>
                 </ItemsControl.ItemTemplate>
             </ItemsControl>
-        </ScrollViewer>
+        </hc:ScrollViewer>
     </Grid>
 </UserControl>
diff --git a/src/MaaWpfGui/Views/UI/VersionUpdateView.xaml b/src/MaaWpfGui/Views/UI/VersionUpdateView.xaml
index f787ab2068..96c7714641 100644
--- a/src/MaaWpfGui/Views/UI/VersionUpdateView.xaml
+++ b/src/MaaWpfGui/Views/UI/VersionUpdateView.xaml
@@ -57,7 +57,10 @@
                         BorderThickness="{TemplateBinding BorderThickness}"
                         BorderBrush="{TemplateBinding BorderBrush}"
                         Focusable="False">
-                        <ScrollViewer x:Name="PART_ContentHost" />
+                        
+                        <hc:ScrollViewer
+                            x:Name="PART_ContentHost"
+                            IsInertiaEnabled="True"/>
                     </Border>
                 </ControlTemplate>
             </FlowDocumentScrollViewer.Template>
diff --git a/src/MaaWpfGui/Views/UserControl/FightSettingsUserControl.xaml b/src/MaaWpfGui/Views/UserControl/FightSettingsUserControl.xaml
index 2cb661dd95..fea1e382b1 100644
--- a/src/MaaWpfGui/Views/UserControl/FightSettingsUserControl.xaml
+++ b/src/MaaWpfGui/Views/UserControl/FightSettingsUserControl.xaml
@@ -16,7 +16,8 @@
     d:DataContext="{d:DesignInstance {x:Type ui:TaskQueueViewModel}}"
     d:DesignWidth="250"
     mc:Ignorable="d">
-    <ScrollViewer>
+    <hc:ScrollViewer
+        IsInertiaEnabled="True">
         <Grid Width="220" Margin="0,0,5,0">
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto" />
@@ -294,5 +295,5 @@
                 </StackPanel>
             </Grid>
         </Grid>
-    </ScrollViewer>
+    </hc:ScrollViewer>
 </UserControl>