From fb0ee9e7d9a8a54a120922c2ced91ed699e0c9b2 Mon Sep 17 00:00:00 2001
From: status102 <102887808+status102@users.noreply.github.com>
Date: Fri, 30 Jan 2026 16:23:02 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E5=88=B7=E7=90=86=E6=99=BA=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E9=AB=98=E7=BA=A7=E8=AE=BE=E7=BD=AEUI=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E9=80=89=E9=A1=B9=E9=A1=BA=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FightSettingsUserControlModel.cs          |  6 +---
 .../TaskQueue/FightSettingsUserControl.xaml   | 28 +++++++++----------
 2 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/FightSettingsUserControlModel.cs b/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/FightSettingsUserControlModel.cs
index 4d737422d3..c6565ff786 100644
--- a/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/FightSettingsUserControlModel.cs
+++ b/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/FightSettingsUserControlModel.cs
@@ -71,11 +71,7 @@ public class FightSettingsUserControlModel : TaskSettingsViewModel
     /// <summary>
     /// Gets or private sets the list of stages.
     /// </summary>
-    public ObservableCollection<StageSourceItem> StageListSource
-    {
-        get => field;
-        private set => SetAndNotify(ref field, value);
-    } = [];
+    public ObservableCollection<StageSourceItem> StageListSource { get => field; private set => SetAndNotify(ref field, value); } = [];
 
     private static readonly Dictionary<string, string> _stageDictionary = new()
         {
diff --git a/src/MaaWpfGui/Views/UserControl/TaskQueue/FightSettingsUserControl.xaml b/src/MaaWpfGui/Views/UserControl/TaskQueue/FightSettingsUserControl.xaml
index 1236401ef7..42785ac046 100644
--- a/src/MaaWpfGui/Views/UserControl/TaskQueue/FightSettingsUserControl.xaml
+++ b/src/MaaWpfGui/Views/UserControl/TaskQueue/FightSettingsUserControl.xaml
@@ -380,6 +380,20 @@
                 <CheckBox Content="{DynamicResource DrGrandet}" IsChecked="{Binding IsDrGrandet}" />
                 <controls:TooltipBlock TooltipText="{DynamicResource DrGrandetTip}" />
             </StackPanel>
+            <CheckBox Margin="0,10" IsChecked="{Binding UseExpiringMedicine}">
+                <TextBlock
+                    Block.TextAlignment="Left"
+                    Text="{DynamicResource UseExpiringMedicine}"
+                    TextWrapping="Wrap" />
+            </CheckBox>
+            <CheckBox
+                Margin="0,10"
+                Content="{DynamicResource HideSeries}"
+                IsChecked="{Binding HideSeries}" />
+            <CheckBox
+                Margin="0,10"
+                Content="{DynamicResource AllowUseStoneSave}"
+                IsChecked="{Binding AllowUseStoneSave}" />
             <StackPanel Margin="0,10" Orientation="Horizontal">
                 <CheckBox Content="{DynamicResource CustomStageCode}" IsChecked="{Binding CustomStageCode}" />
                 <controls:TooltipBlock TooltipText="{DynamicResource CustomStageCodeTip}" />
@@ -388,24 +402,10 @@
                 Margin="0,10"
                 Content="{DynamicResource UseAlternateStage}"
                 IsChecked="{Binding UseAlternateStage}" />
-            <CheckBox
-                Margin="0,10"
-                Content="{DynamicResource AllowUseStoneSave}"
-                IsChecked="{Binding AllowUseStoneSave}" />
-            <CheckBox Margin="0,10" IsChecked="{Binding UseExpiringMedicine}">
-                <TextBlock
-                    Block.TextAlignment="Left"
-                    Text="{DynamicResource UseExpiringMedicine}"
-                    TextWrapping="Wrap" />
-            </CheckBox>
             <CheckBox
                 Margin="0,10"
                 Content="{DynamicResource HideUnavailableStage}"
                 IsChecked="{Binding HideUnavailableStage}" />
-            <CheckBox
-                Margin="0,10"
-                Content="{DynamicResource HideSeries}"
-                IsChecked="{Binding HideSeries}" />
             <CheckBox
                 Margin="0,10"
                 Content="{DynamicResource UseWeeklySchedule}"