From d6bfa5f7363e74eba0d2c135fa112dbf2395201f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BE=89=E9=B8=AD=E8=9B=8B?= <huiyadanli@gmail.com>
Date: Thu, 2 Oct 2025 15:11:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=BB=9A=E5=8A=A8=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../View/Pages/GearTriggerPage.xaml           | 64 +++++++++++++------
 .../GearTask/PathingTaskSelectionWindow.xaml  |  2 +-
 2 files changed, 45 insertions(+), 21 deletions(-)

diff --git a/BetterGenshinImpact/View/Pages/GearTriggerPage.xaml b/BetterGenshinImpact/View/Pages/GearTriggerPage.xaml
index 8093ed3e..0d7437dd 100644
--- a/BetterGenshinImpact/View/Pages/GearTriggerPage.xaml
+++ b/BetterGenshinImpact/View/Pages/GearTriggerPage.xaml
@@ -274,28 +274,52 @@
                Margin="10">
         <TabControl Style="{StaticResource ConsistentTabControlStyle}">
             <TabItem Header="定时触发" Style="{StaticResource ConsistentTabItemStyle}">
-                <StackPanel>
-                    <!-- 表格头部 -->
-                    <ContentPresenter ContentTemplate="{StaticResource TimedTableHeaderTemplate}" />
-                    <!-- 列表内容 -->
-                    <ui:ListView ItemsSource="{Binding TimedTriggers}"
-                                 SelectedItem="{Binding SelectedTrigger, Mode=TwoWay}"
-                                 ItemTemplate="{StaticResource TimedTriggerItemTemplate}"
-                                 BorderThickness="0"
-                                 Margin="0" />
-                </StackPanel>
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="*" />
+                    </Grid.RowDefinitions>
+                    
+                    <!-- 固定表格头部 -->
+                    <ContentPresenter Grid.Row="0" 
+                                      ContentTemplate="{StaticResource TimedTableHeaderTemplate}" />
+                    
+                    <!-- 可滚动的列表内容 -->
+                    <ScrollViewer Grid.Row="1"
+                                  VerticalScrollBarVisibility="Auto" 
+                                  HorizontalScrollBarVisibility="Disabled">
+                        <ui:ListView ItemsSource="{Binding TimedTriggers}"
+                                     SelectedItem="{Binding SelectedTrigger, Mode=TwoWay}"
+                                     ItemTemplate="{StaticResource TimedTriggerItemTemplate}"
+                                     ScrollViewer.HorizontalScrollBarVisibility="Disabled"
+                                     BorderThickness="0"
+                                     Margin="0" />
+                    </ScrollViewer>
+                </Grid>
             </TabItem>
             <TabItem Header="快捷键触发" Style="{StaticResource ConsistentTabItemStyle}">
-                <StackPanel>
-                    <!-- 表格头部 -->
-                    <ContentPresenter ContentTemplate="{StaticResource TableHeaderTemplate}" />
-                    <!-- 列表内容 -->
-                    <ui:ListView ItemsSource="{Binding HotkeyTriggers}"
-                                 SelectedItem="{Binding SelectedTrigger, Mode=TwoWay}"
-                                 ItemTemplate="{StaticResource TriggerItemTemplate}"
-                                 BorderThickness="0"
-                                 Margin="0" />
-                </StackPanel>
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="*" />
+                    </Grid.RowDefinitions>
+                    
+                    <!-- 固定表格头部 -->
+                    <ContentPresenter Grid.Row="0" 
+                                      ContentTemplate="{StaticResource TableHeaderTemplate}" />
+                    
+                    <!-- 可滚动的列表内容 -->
+                    <ScrollViewer Grid.Row="1"
+                                  VerticalScrollBarVisibility="Auto" 
+                                  HorizontalScrollBarVisibility="Disabled">
+                        <ui:ListView ItemsSource="{Binding HotkeyTriggers}"
+                                     SelectedItem="{Binding SelectedTrigger, Mode=TwoWay}"
+                                     ItemTemplate="{StaticResource TriggerItemTemplate}"
+                                     ScrollViewer.HorizontalScrollBarVisibility="Disabled"
+                                     BorderThickness="0"
+                                     Margin="0" />
+                    </ScrollViewer>
+                </Grid>
             </TabItem>
         </TabControl>
     </ui:Border>
diff --git a/BetterGenshinImpact/View/Windows/GearTask/PathingTaskSelectionWindow.xaml b/BetterGenshinImpact/View/Windows/GearTask/PathingTaskSelectionWindow.xaml
index 9721f65d..5ae35c00 100644
--- a/BetterGenshinImpact/View/Windows/GearTask/PathingTaskSelectionWindow.xaml
+++ b/BetterGenshinImpact/View/Windows/GearTask/PathingTaskSelectionWindow.xaml
@@ -187,7 +187,7 @@
                 <StackPanel Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Center">
                     <ui:TextBlock Text="任务导入方式：" VerticalAlignment="Center" Margin="0,0,8,0" />
                     <ui:ToggleSwitch IsChecked="{Binding IsGroupImportMode}"
-                                     OnContent="按组引用"
+                                     OnContent="按组引用（推荐）"
                                      OffContent="逐个添加"
                                      VerticalAlignment="Center" />
                 </StackPanel>