From 5096b733b4f50217aef7889963dee6a9160771be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BE=89=E9=B8=AD=E8=9B=8B?= <huiyadanli@gmail.com>
Date: Mon, 18 May 2026 02:49:05 +0800
Subject: [PATCH] =?UTF-8?q?feat(GearTriggerPage):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E9=BD=BF=E8=BD=AE=E8=A7=A6=E5=8F=91=E5=99=A8=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=B8=83=E5=B1=80=E5=B9=B6=E6=B7=BB=E5=8A=A0=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

将新增触发器按钮从各标签页内部移至标签头部，根据当前选中标签动态显示对应添加按钮
为触发器删除操作添加带有类型区分提示文本的确认弹窗，防止误删
---
 .../View/Pages/GearTriggerPage.xaml           | 69 ++++++++++++-------
 .../Pages/GearTriggerPageViewModel.cs         | 11 +++
 2 files changed, 57 insertions(+), 23 deletions(-)

diff --git a/BetterGenshinImpact/View/Pages/GearTriggerPage.xaml b/BetterGenshinImpact/View/Pages/GearTriggerPage.xaml
index eb77dd43..715a076c 100644
--- a/BetterGenshinImpact/View/Pages/GearTriggerPage.xaml
+++ b/BetterGenshinImpact/View/Pages/GearTriggerPage.xaml
@@ -20,6 +20,24 @@
 
     <UserControl.Resources>
         <ResourceDictionary>
+            <Style x:Key="TimedTabActionButtonStyle" TargetType="ui:Button" BasedOn="{StaticResource {x:Type ui:Button}}">
+                <Setter Property="Visibility" Value="Collapsed" />
+                <Style.Triggers>
+                    <DataTrigger Binding="{Binding SelectedIndex, RelativeSource={RelativeSource AncestorType=TabControl}}" Value="0">
+                        <Setter Property="Visibility" Value="Visible" />
+                    </DataTrigger>
+                </Style.Triggers>
+            </Style>
+
+            <Style x:Key="HotkeyTabActionButtonStyle" TargetType="ui:Button" BasedOn="{StaticResource {x:Type ui:Button}}">
+                <Setter Property="Visibility" Value="Collapsed" />
+                <Style.Triggers>
+                    <DataTrigger Binding="{Binding SelectedIndex, RelativeSource={RelativeSource AncestorType=TabControl}}" Value="1">
+                        <Setter Property="Visibility" Value="Visible" />
+                    </DataTrigger>
+                </Style.Triggers>
+            </Style>
+            
             <Style x:Key="ConsistentTabControlStyle" TargetType="TabControl"
                    BasedOn="{StaticResource {x:Type TabControl}}">
                 <Setter Property="Background" Value="Transparent" />
@@ -41,7 +59,30 @@
                                         BorderBrush="{DynamicResource SurfaceStrokeColorDefaultBrush}"
                                         BorderThickness="1"
                                         CornerRadius="10">
-                                    <TabPanel IsItemsHost="True" Background="Transparent" />
+                                    <Grid>
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="*" />
+                                            <ColumnDefinition Width="Auto" />
+                                        </Grid.ColumnDefinitions>
+
+                                        <TabPanel Grid.Column="0" IsItemsHost="True" Background="Transparent" />
+
+                                        <StackPanel Grid.Column="1"
+                                                    Orientation="Horizontal"
+                                                    VerticalAlignment="Center"
+                                                    Margin="12,0,0,0">
+                                            <ui:Button Style="{StaticResource TimedTabActionButtonStyle}"
+                                                       Content="新增定时触发器"
+                                                       Command="{Binding DataContext.AddTimedTriggerCommand, RelativeSource={RelativeSource AncestorType=UserControl}}"
+                                                       Icon="{ui:SymbolIcon Add24}"
+                                                       Appearance="Primary" />
+                                            <ui:Button Style="{StaticResource HotkeyTabActionButtonStyle}"
+                                                       Content="新增快捷键触发器"
+                                                       Command="{Binding DataContext.AddHotkeyTriggerCommand, RelativeSource={RelativeSource AncestorType=UserControl}}"
+                                                       Icon="{ui:SymbolIcon Add24}"
+                                                       Appearance="Primary" />
+                                        </StackPanel>
+                                    </Grid>
                                 </Border>
 
                                 <Border Grid.Row="1"
@@ -469,25 +510,16 @@
                 <TabItem Header="定时触发" Style="{StaticResource ConsistentTabItemStyle}">
                     <Grid>
                         <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto" />
                             <RowDefinition Height="Auto" />
                             <RowDefinition Height="*" />
                         </Grid.RowDefinitions>
 
-                        <Grid Grid.Row="0" Margin="16,12,16,0">
-                            <ui:Button HorizontalAlignment="Right"
-                                       Content="新增定时触发器"
-                                       Command="{Binding AddTimedTriggerCommand}"
-                                       Icon="{ui:SymbolIcon Add24}"
-                                       Appearance="Primary" />
-                        </Grid>
-
                         <!-- 固定表格头部 -->
-                        <ContentPresenter Grid.Row="1"
+                        <ContentPresenter Grid.Row="0"
                                           ContentTemplate="{StaticResource TimedTableHeaderTemplate}" />
 
                         <!-- 可滚动的列表内容 -->
-                        <Grid Grid.Row="2"
+                        <Grid Grid.Row="1"
                               Margin="0,6,0,12">
                             <ui:ListView ItemsSource="{Binding TimedTriggers}"
                                          ItemContainerStyle="{StaticResource TriggerListViewItemStyle}"
@@ -523,25 +555,16 @@
                 <TabItem Header="快捷键触发" Style="{StaticResource ConsistentTabItemStyle}">
                     <Grid>
                         <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto" />
                             <RowDefinition Height="Auto" />
                             <RowDefinition Height="*" />
                         </Grid.RowDefinitions>
 
-                        <Grid Grid.Row="0" Margin="16,12,16,0">
-                            <ui:Button HorizontalAlignment="Right"
-                                       Content="新增快捷键触发器"
-                                       Command="{Binding AddHotkeyTriggerCommand}"
-                                       Icon="{ui:SymbolIcon Add24}"
-                                       Appearance="Primary" />
-                        </Grid>
-
                         <!-- 固定表格头部 -->
-                        <ContentPresenter Grid.Row="1"
+                        <ContentPresenter Grid.Row="0"
                                           ContentTemplate="{StaticResource TableHeaderTemplate}" />
 
                         <!-- 可滚动的列表内容 -->
-                        <Grid Grid.Row="2"
+                        <Grid Grid.Row="1"
                               Margin="0,6,0,12">
                             <ui:ListView ItemsSource="{Binding HotkeyTriggers}"
                                          ItemContainerStyle="{StaticResource TriggerListViewItemStyle}"
diff --git a/BetterGenshinImpact/ViewModel/Pages/GearTriggerPageViewModel.cs b/BetterGenshinImpact/ViewModel/Pages/GearTriggerPageViewModel.cs
index c00b3d4e..5508742d 100644
--- a/BetterGenshinImpact/ViewModel/Pages/GearTriggerPageViewModel.cs
+++ b/BetterGenshinImpact/ViewModel/Pages/GearTriggerPageViewModel.cs
@@ -198,6 +198,17 @@ public partial class GearTriggerPageViewModel : ViewModel
             return;
         }
 
+        var triggerTypeName = trigger.TriggerType == TriggerType.Timed ? "定时触发器" : "快捷键触发器";
+        var result = await ThemedMessageBox.ShowAsync(
+            $"确定要删除{triggerTypeName}「{trigger.Name}」吗？",
+            "确认删除",
+            System.Windows.MessageBoxButton.YesNo,
+            ThemedMessageBox.MessageBoxIcon.Question);
+        if (result != System.Windows.MessageBoxResult.Yes)
+        {
+            return;
+        }
+
         switch (trigger.TriggerType)
         {
             case TriggerType.Timed: