From c1fcaff28a97d5b6f0ee8572c2baca1c9baa6796 Mon Sep 17 00:00:00 2001
From: CJKmkp <2564608840@qq.com>
Date: Sat, 13 Sep 2025 12:05:13 +0800
Subject: [PATCH] =?UTF-8?q?fix:issue=20#175=20=E7=AE=80=E6=98=93=E5=AE=9E?=
 =?UTF-8?q?=E7=8E=B0=EF=BC=88=E5=90=8E=E7=BB=AD=E4=BC=9A=E6=94=B9=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Ink Canvas/MainWindow.xaml                    |  9 +++++++++
 Ink Canvas/MainWindow_cs/MW_Settings.cs       |  7 +++++++
 Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs |  2 ++
 Ink Canvas/MainWindow_cs/MW_Timer.cs          | 14 ++++++++++++--
 Ink Canvas/Resources/Settings.cs              |  3 +++
 5 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/Ink Canvas/MainWindow.xaml b/Ink Canvas/MainWindow.xaml
index ab66b0e7..14b46837 100644
--- a/Ink Canvas/MainWindow.xaml	
+++ b/Ink Canvas/MainWindow.xaml	
@@ -2600,6 +2600,15 @@
                                                          FontFamily="Microsoft YaHei UI" FontWeight="Bold"
                                                          Toggled="ToggleSwitchAutoFoldInPPTSlideShow_Toggled" />
                                     </ui:SimpleStackPanel>
+                                    <ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
+                                        <TextBlock Foreground="#fafafa" Text="软件退出后保持收纳模式"
+                                                   VerticalAlignment="Center" FontSize="14" Margin="0,0,16,0" />
+                                        <ui:ToggleSwitch OnContent="" OffContent=""
+                                                         Name="ToggleSwitchKeepFoldAfterSoftwareExit"
+                                                         IsOn="False" FontFamily="Microsoft YaHei UI" FontWeight="Bold"
+                                                         Toggled="ToggleSwitchKeepFoldAfterSoftwareExit_Toggled" />
+                                    </ui:SimpleStackPanel>
+                                    <TextBlock Text="# 开启后，执行自动收纳的软件在软件退出后不退出收纳模式，保持收纳状态" TextWrapping="Wrap" Foreground="#a1a1aa" />
                                     <Line HorizontalAlignment="Center" X1="0" Y1="0" X2="400" Y2="0" Stroke="#3f3f46"
                                           StrokeThickness="1" Margin="0,4,0,4" />
                                     <TextBlock Margin="0,0,0,8" Text="自动查杀" FontWeight="Bold" Foreground="#fafafa"
diff --git a/Ink Canvas/MainWindow_cs/MW_Settings.cs b/Ink Canvas/MainWindow_cs/MW_Settings.cs
index fd4182d3..577dd85d 100644
--- a/Ink Canvas/MainWindow_cs/MW_Settings.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_Settings.cs	
@@ -2966,6 +2966,13 @@ namespace Ink_Canvas
             SaveSettingsToFile();
         }
 
+        private void ToggleSwitchKeepFoldAfterSoftwareExit_Toggled(object sender, RoutedEventArgs e)
+        {
+            if (!isLoaded) return;
+            Settings.Automation.KeepFoldAfterSoftwareExit = ToggleSwitchKeepFoldAfterSoftwareExit.IsOn;
+            SaveSettingsToFile();
+        }
+
         private void ToggleSwitchAlwaysGoToFirstPageOnReenter_Toggled(object sender, RoutedEventArgs e)
         {
             if (!isLoaded) return;
diff --git a/Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs b/Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs
index 78ccbcaa..2e178d12 100644
--- a/Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs	
@@ -856,6 +856,8 @@ namespace Ink_Canvas
 
                 ToggleSwitchAutoFoldAfterPPTSlideShow.IsOn = Settings.Automation.IsAutoFoldAfterPPTSlideShow;
 
+                ToggleSwitchKeepFoldAfterSoftwareExit.IsOn = Settings.Automation.KeepFoldAfterSoftwareExit;
+
                 if (Settings.Automation.IsAutoKillEasiNote || Settings.Automation.IsAutoKillPptService ||
                     Settings.Automation.IsAutoKillHiteAnnotation || Settings.Automation.IsAutoKillInkCanvas
                     || Settings.Automation.IsAutoKillICA || Settings.Automation.IsAutoKillIDT ||
diff --git a/Ink Canvas/MainWindow_cs/MW_Timer.cs b/Ink Canvas/MainWindow_cs/MW_Timer.cs
index 76d99818..9ddcfd79 100644
--- a/Ink Canvas/MainWindow_cs/MW_Timer.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_Timer.cs	
@@ -578,8 +578,18 @@ namespace Ink_Canvas
                 }
                 else
                 {
-                    if (isFloatingBarFolded && !foldFloatingBarByUser) UnFoldFloatingBar_MouseUp(new object(), null);
-                    unfoldFloatingBarByUser = false;
+                    // 检查是否启用了软件退出后保持收纳模式
+                    if (Settings.Automation.KeepFoldAfterSoftwareExit)
+                    {
+                        // 如果启用了保持收纳模式，则不自动展开浮动栏
+                        unfoldFloatingBarByUser = false;
+                    }
+                    else
+                    {
+                        // 原有的逻辑：软件退出后自动展开浮动栏
+                        if (isFloatingBarFolded && !foldFloatingBarByUser) UnFoldFloatingBar_MouseUp(new object(), null);
+                        unfoldFloatingBarByUser = false;
+                    }
                 }
             }
             catch { }
diff --git a/Ink Canvas/Resources/Settings.cs b/Ink Canvas/Resources/Settings.cs
index 9b6c8b5c..915e919f 100644
--- a/Ink Canvas/Resources/Settings.cs	
+++ b/Ink Canvas/Resources/Settings.cs	
@@ -448,6 +448,9 @@ namespace Ink_Canvas
         [JsonProperty("autoDelSavedFilesDaysThreshold")]
         public int AutoDelSavedFilesDaysThreshold = 15;
 
+        [JsonProperty("keepFoldAfterSoftwareExit")]
+        public bool KeepFoldAfterSoftwareExit { get; set; } = false;
+
         [JsonProperty("isSaveFullPageStrokes")]
         public bool IsSaveFullPageStrokes;