From b2ef8b96ef616f9a7ce8bf0e9ff1855a6443968b Mon Sep 17 00:00:00 2001
From: CJKmkp <2564608840@qq.com>
Date: Sun, 27 Jul 2025 22:52:04 +0800
Subject: [PATCH] fix:issue #93

---
 Ink Canvas/MainWindow.xaml                    |  6 ++++
 Ink Canvas/MainWindow_cs/MW_BoardIcons.cs     | 32 +++++++++++++++++++
 Ink Canvas/MainWindow_cs/MW_Settings.cs       |  7 ++++
 Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs |  1 +
 Ink Canvas/Resources/Settings.cs              |  2 ++
 5 files changed, 48 insertions(+)

diff --git a/Ink Canvas/MainWindow.xaml b/Ink Canvas/MainWindow.xaml
index eb456c64..ca788761 100644
--- a/Ink Canvas/MainWindow.xaml	
+++ b/Ink Canvas/MainWindow.xaml	
@@ -774,6 +774,12 @@
                                                          FontFamily="Microsoft YaHei UI" FontWeight="Bold"
                                                          Toggled="ToggleSwitchClearCanvasAndClearTimeMachine_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="ToggleSwitchClearCanvasAlsoClearImages"
+                                                         IsOn="False" FontFamily="Microsoft YaHei UI" FontWeight="Bold"
+                                                         Toggled="ToggleSwitchClearCanvasAlsoClearImages_Toggled" />
+                                    </ui:SimpleStackPanel>
                                     <ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
                                         <TextBlock Foreground="#fafafa" Text="插入图片时自动压缩（大于1920x1080）" VerticalAlignment="Center" FontSize="14" Margin="0,0,16,0" />
                                         <ui:ToggleSwitch OnContent="" OffContent="" Name="ToggleSwitchCompressPicturesUploaded"
diff --git a/Ink Canvas/MainWindow_cs/MW_BoardIcons.cs b/Ink Canvas/MainWindow_cs/MW_BoardIcons.cs
index 100a6421..f5b21245 100644
--- a/Ink Canvas/MainWindow_cs/MW_BoardIcons.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_BoardIcons.cs	
@@ -716,12 +716,44 @@ namespace Ink_Canvas {
         private void BoardSymbolIconDelete_MouseUp(object sender, RoutedEventArgs e) {
             PenIcon_Click(null, null);
             SymbolIconDelete_MouseUp(null, null);
+
+            // 根据设置决定是否清空图片
+            if (Settings.Canvas.ClearCanvasAlsoClearImages) {
+                // 如果设置为清空图片，则直接清空所有子元素
+                System.Diagnostics.Debug.WriteLine("BoardSymbolIconDelete: Clearing all children including images");
+                inkCanvas.Children.Clear();
+            } else {
+                // 保存非笔画元素（如图片）
+                System.Diagnostics.Debug.WriteLine("BoardSymbolIconDelete: Preserving non-stroke elements (images)");
+                var preservedElements = PreserveNonStrokeElements();
+                System.Diagnostics.Debug.WriteLine($"BoardSymbolIconDelete: Preserved elements count: {preservedElements.Count}");
+                inkCanvas.Children.Clear();
+                // 恢复非笔画元素
+                RestoreNonStrokeElements(preservedElements);
+                System.Diagnostics.Debug.WriteLine($"BoardSymbolIconDelete: inkCanvas.Children.Count after restore: {inkCanvas.Children.Count}");
+            }
         }
         private void BoardSymbolIconDeleteInkAndHistories_MouseUp(object sender, RoutedEventArgs e)
         {
             PenIcon_Click(null, null);
             SymbolIconDelete_MouseUp(null, null);
             if (Settings.Canvas.ClearCanvasAndClearTimeMachine == false) timeMachine.ClearStrokeHistory();
+
+            // 根据设置决定是否清空图片
+            if (Settings.Canvas.ClearCanvasAlsoClearImages) {
+                // 如果设置为清空图片，则直接清空所有子元素
+                System.Diagnostics.Debug.WriteLine("BoardSymbolIconDeleteInkAndHistories: Clearing all children including images");
+                inkCanvas.Children.Clear();
+            } else {
+                // 保存非笔画元素（如图片）
+                System.Diagnostics.Debug.WriteLine("BoardSymbolIconDeleteInkAndHistories: Preserving non-stroke elements (images)");
+                var preservedElements = PreserveNonStrokeElements();
+                System.Diagnostics.Debug.WriteLine($"BoardSymbolIconDeleteInkAndHistories: Preserved elements count: {preservedElements.Count}");
+                inkCanvas.Children.Clear();
+                // 恢复非笔画元素
+                RestoreNonStrokeElements(preservedElements);
+                System.Diagnostics.Debug.WriteLine($"BoardSymbolIconDeleteInkAndHistories: inkCanvas.Children.Count after restore: {inkCanvas.Children.Count}");
+            }
         }
 
         private void BoardLaunchEasiCamera_MouseUp(object sender, MouseButtonEventArgs e) {
diff --git a/Ink Canvas/MainWindow_cs/MW_Settings.cs b/Ink Canvas/MainWindow_cs/MW_Settings.cs
index 93f84f04..013b9289 100644
--- a/Ink Canvas/MainWindow_cs/MW_Settings.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_Settings.cs	
@@ -2221,6 +2221,13 @@ namespace Ink_Canvas {
             SaveSettingsToFile();
         }
 
+        private void ToggleSwitchClearCanvasAlsoClearImages_Toggled(object sender, RoutedEventArgs e)
+        {
+            if (!isLoaded) return;
+            Settings.Canvas.ClearCanvasAlsoClearImages = ToggleSwitchClearCanvasAlsoClearImages.IsOn;
+            SaveSettingsToFile();
+        }
+
         private void ToggleSwitchCompressPicturesUploaded_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 09b258b8..a263c22a 100644
--- a/Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs	
@@ -466,6 +466,7 @@ namespace Ink_Canvas {
 
                 ToggleSwitchClearCanvasAndClearTimeMachine.IsOn =
                     Settings.Canvas.ClearCanvasAndClearTimeMachine == true;
+                ToggleSwitchClearCanvasAlsoClearImages.IsOn = Settings.Canvas.ClearCanvasAlsoClearImages;
 
                 switch (Settings.Canvas.EraserShapeType) {
                     case 0: {
diff --git a/Ink Canvas/Resources/Settings.cs b/Ink Canvas/Resources/Settings.cs
index f76a5d58..eb9428fb 100644
--- a/Ink Canvas/Resources/Settings.cs	
+++ b/Ink Canvas/Resources/Settings.cs	
@@ -87,6 +87,8 @@ namespace Ink_Canvas
         public bool IsCompressPicturesUploaded { get; set; } = false;
         [JsonProperty("enablePalmEraser")]
         public bool EnablePalmEraser { get; set; } = true;
+        [JsonProperty("clearCanvasAlsoClearImages")]
+        public bool ClearCanvasAlsoClearImages { get; set; } = false;
     }
 
     public enum OptionalOperation