From b68a50431fcec70f961e4c05b084736eacad8c51 Mon Sep 17 00:00:00 2001
From: PANDA-JSR <pandajsr72@gmail.com>
Date: Fri, 23 Jan 2026 12:21:28 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat(=E5=A2=A8=E8=BF=B9=E6=B8=90=E9=9A=90):?=
 =?UTF-8?q?=20=E6=B7=BB=E5=8A=A0=E5=9C=A8=E7=AC=94=E5=B7=A5=E5=85=B7?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E4=B8=AD=E9=9A=90=E8=97=8F=E5=A2=A8=E8=BF=B9?=
 =?UTF-8?q?=E6=B8=90=E9=9A=90=E6=8E=A7=E5=88=B6=E5=BC=80=E5=85=B3=E7=9A=84?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

添加新设置选项，允许用户在笔工具菜单中隐藏墨迹渐隐控制开关。该功能包括：
- 新增设置属性 HideInkFadeControlInPenMenu
- 在设置界面添加对应的开关控件
- 实现开关状态同步和可见性更新逻辑
- 更新主界面笔工具菜单中的控制面板可见性

终于不怕课间有人玩墨迹渐隐了！！！
---
 Ink Canvas/MainWindow.xaml                    | 14 ++++-
 Ink Canvas/MainWindow.xaml.cs                 | 51 +++++++++++++++++++
 Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs |  9 ++++
 Ink Canvas/Resources/Settings.cs              |  2 +
 .../SettingsViews/CanvasAndInkPanel.xaml      | 14 +++++
 .../SettingsViews/CanvasAndInkPanel.xaml.cs   |  5 ++
 6 files changed, 93 insertions(+), 2 deletions(-)

diff --git a/Ink Canvas/MainWindow.xaml b/Ink Canvas/MainWindow.xaml
index 1b70c42a..5c385d98 100644
--- a/Ink Canvas/MainWindow.xaml	
+++ b/Ink Canvas/MainWindow.xaml	
@@ -851,6 +851,16 @@
                                         <TextBlock Foreground="#fafafa" Text="{Binding ElementName=InkFadeTimeSlider, Path=Value, StringFormat={}{0:0}ms}" 
                                                    VerticalAlignment="Center" FontSize="14" Margin="16,0,0,0" />
                                     </ui:SimpleStackPanel>
+                                    <Line HorizontalAlignment="Center" X1="0" Y1="0" X2="400" Y2="0" Stroke="#3f3f46"
+                                          StrokeThickness="1" Margin="0,4,0,4" />
+                                    <ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
+                                        <TextBlock Foreground="#fafafa" Text="在笔工具菜单中隐藏墨迹渐隐控制" VerticalAlignment="Center"
+                                                   FontSize="14" Margin="0,0,16,0" />
+                                        <ui:ToggleSwitch OnContent="" OffContent="" Name="ToggleSwitchHideInkFadeControlInPenMenu"
+                                                         IsOn="False" FontFamily="Microsoft YaHei UI" FontWeight="Bold"
+                                                         Toggled="ToggleSwitchHideInkFadeControlInPenMenu_Toggled" />
+                                    </ui:SimpleStackPanel>
+                                    <TextBlock Text="# 开启后，主工具栏上点击笔工具后弹出的上下文菜单中将不显示墨迹渐隐控制开关，可以有效防止课间老是有人玩墨迹渐隐功能" TextWrapping="Wrap" Foreground="#a1a1aa" />
 
                                 </ui:SimpleStackPanel>
                             </GroupBox>
@@ -5296,7 +5306,7 @@
                                                                             IsOn="{Binding ElementName=ToggleSwitchEnableInkToShape, Path=IsOn}" />
                                                                     </ui:SimpleStackPanel>
                                                                     <ui:SimpleStackPanel Orientation="Horizontal"
-                                                                        Width="100">
+                                                                        Width="100" x:Name="InkFadeControlPanel1">
                                                                         <Label Margin="0,0,10,0" Content="墨迹渐隐"
                                                                             Foreground="{DynamicResource FloatBarForeground}"
                                                                             FontSize="12"
@@ -8320,7 +8330,7 @@
                                                                         IsOn="{Binding ElementName=ToggleSwitchEnableInkToShape, Path=IsOn}" />
                                                                 </ui:SimpleStackPanel>
                                                                 <ui:SimpleStackPanel Orientation="Horizontal"
-                                                                    Width="100">
+                                                                    Width="100" x:Name="InkFadeControlPanel2">
                                                                     <Label Margin="0,0,10,0" Content="墨迹渐隐"
                                                                            Foreground="{DynamicResource FloatBarForeground}"
                                                                            FontSize="12" VerticalAlignment="Center" />
diff --git a/Ink Canvas/MainWindow.xaml.cs b/Ink Canvas/MainWindow.xaml.cs
index 9a98085f..b8fa01cc 100644
--- a/Ink Canvas/MainWindow.xaml.cs	
+++ b/Ink Canvas/MainWindow.xaml.cs	
@@ -2692,6 +2692,57 @@ private void ToggleSwitchInkFadeInPanel_Toggled(object sender, RoutedEventArgs e
             }
         }
 
+        /// <summary>
+        /// 在笔工具菜单中隐藏墨迹渐隐控制开关切换事件处理
+        /// </summary>
+        private void ToggleSwitchHideInkFadeControlInPenMenu_Toggled(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                if (isLoaded)
+                {
+                    Settings.Canvas.HideInkFadeControlInPenMenu = ToggleSwitchHideInkFadeControlInPenMenu.IsOn;
+                    SaveSettingsToFile();
+                }
+
+                // 立即更新墨迹渐隐控制开关的可见性
+                UpdateInkFadeControlVisibility();
+
+                LogHelper.WriteLogToFile($"在笔工具菜单中隐藏墨迹渐隐控制开关已{(Settings.Canvas.HideInkFadeControlInPenMenu ? "启用" : "禁用")}", LogHelper.LogType.Event);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"切换在笔工具菜单中隐藏墨迹渐隐控制开关时出错: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+
+        /// <summary>
+        /// 更新墨迹渐隐控制开关的可见性
+        /// </summary>
+        private void UpdateInkFadeControlVisibility()
+        {
+            try
+            {
+                bool isHidden = Settings.Canvas.HideInkFadeControlInPenMenu;
+
+                // 控制 InkFadeControlPanel1（批注子面板中）的可见性
+                if (InkFadeControlPanel1 != null)
+                {
+                    InkFadeControlPanel1.Visibility = isHidden ? Visibility.Collapsed : Visibility.Visible;
+                }
+
+                // 控制 InkFadeControlPanel2（普通画笔面板中）的可见性
+                if (InkFadeControlPanel2 != null)
+                {
+                    InkFadeControlPanel2.Visibility = isHidden ? Visibility.Collapsed : Visibility.Visible;
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"更新墨迹渐隐控制面板可见性时出错: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+
         /// <summary>
         /// PPT放映模式显示手势按钮开关切换事件处理
         /// </summary>
diff --git a/Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs b/Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs
index b78b7e20..32408a0f 100644
--- a/Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs	
@@ -1205,6 +1205,15 @@ private void LoadInkFadeSettings()
                     _inkFadeManager.UpdateFadeTime(Settings.Canvas.InkFadeTime);
                 }
 
+                // 同步在笔工具菜单中隐藏墨迹渐隐控制开关的设置
+                if (ToggleSwitchHideInkFadeControlInPenMenu != null)
+                {
+                    ToggleSwitchHideInkFadeControlInPenMenu.IsOn = Settings.Canvas.HideInkFadeControlInPenMenu;
+                }
+
+                // 根据设置更新墨迹渐隐控制开关的可见性
+                UpdateInkFadeControlVisibility();
+
                 LogHelper.WriteLogToFile("墨迹渐隐设置已加载", LogHelper.LogType.Event);
             }
             catch (Exception ex)
diff --git a/Ink Canvas/Resources/Settings.cs b/Ink Canvas/Resources/Settings.cs
index 537da24e..c99d0d19 100644
--- a/Ink Canvas/Resources/Settings.cs	
+++ b/Ink Canvas/Resources/Settings.cs	
@@ -106,6 +106,8 @@ public class Canvas
         public bool EnableInkFade { get; set; } = false;
         [JsonProperty("inkFadeTime")]
         public int InkFadeTime { get; set; } = 3000; // 墨迹渐隐时间（毫秒）
+        [JsonProperty("hideInkFadeControlInPenMenu")]
+        public bool HideInkFadeControlInPenMenu { get; set; } = false; // 是否在笔工具菜单中隐藏墨迹渐隐控制开关
 
     }
 
diff --git a/Ink Canvas/Windows/SettingsViews/SettingsViews/CanvasAndInkPanel.xaml b/Ink Canvas/Windows/SettingsViews/SettingsViews/CanvasAndInkPanel.xaml
index 5201d4e1..aff58eca 100644
--- a/Ink Canvas/Windows/SettingsViews/SettingsViews/CanvasAndInkPanel.xaml	
+++ b/Ink Canvas/Windows/SettingsViews/SettingsViews/CanvasAndInkPanel.xaml	
@@ -249,6 +249,20 @@
                             <TextBlock x:Name="InkFadeTimeText" Text="3000ms" VerticalAlignment="Center" FontSize="14" Margin="12,0,0,0" Foreground="#2e3436"/>
                         </StackPanel>
                     </Grid>
+                    <Border Height="1" Background="#ebebeb"/>
+                    <Grid Height="54">
+                        <StackPanel Orientation="Vertical" Margin="18,0,0,0" VerticalAlignment="Center" HorizontalAlignment="Left">
+                            <TextBlock Foreground="#2e3436" FontSize="14.5" Text="在笔工具菜单中隐藏墨迹渐隐控制" HorizontalAlignment="Left"/>
+                            <TextBlock Foreground="#9a9996" FontSize="11" Margin="0,3.5,0,0" Text="开启后，主工具栏上点击笔工具后弹出的上下文菜单中将不显示墨迹渐隐控制开关" HorizontalAlignment="Left"/>
+                        </StackPanel>
+                        <Border x:Name="ToggleSwitchHideInkFadeControlInPenMenu" Style="{StaticResource ToggleSwitchStyle}" Background="#e1e1e1" Tag="HideInkFadeControlInPenMenu" MouseLeftButtonDown="ToggleSwitch_Click">
+                            <Border Width="19" Height="19" Background="White" CornerRadius="10" HorizontalAlignment="Left" VerticalAlignment="Center">
+                                <Border.Effect>
+                                    <DropShadowEffect BlurRadius="4" Direction="-45" Color="Black" Opacity="0.3" ShadowDepth="0"/>
+                                </Border.Effect>
+                            </Border>
+                        </Border>
+                    </Grid>
                 </StackPanel>
             </Border>
             
diff --git a/Ink Canvas/Windows/SettingsViews/SettingsViews/CanvasAndInkPanel.xaml.cs b/Ink Canvas/Windows/SettingsViews/SettingsViews/CanvasAndInkPanel.xaml.cs
index 63db2229..d2a9cb50 100644
--- a/Ink Canvas/Windows/SettingsViews/SettingsViews/CanvasAndInkPanel.xaml.cs	
+++ b/Ink Canvas/Windows/SettingsViews/SettingsViews/CanvasAndInkPanel.xaml.cs	
@@ -360,6 +360,11 @@ private void ToggleSwitch_Click(object sender, RoutedEventArgs e)
                     }
                     break;
 
+                case "HideInkFadeControlInPenMenu":
+                    // 调用 MainWindow 中的方法
+                    MainWindowSettingsHelper.InvokeToggleSwitchToggled("ToggleSwitchHideInkFadeControlInPenMenu", newState);
+                    break;
+
                 case "EnableAutoSaveStrokes":
                     // 调用 MainWindow 中的方法
                     MainWindowSettingsHelper.InvokeToggleSwitchToggled("ToggleSwitchEnableAutoSaveStrokes", newState);

From 5b290ef5c0d851030ce7f1384e07eac1737af61d Mon Sep 17 00:00:00 2001
From: doudou0720 <98651603+doudou0720@users.noreply.github.com>
Date: Sat, 31 Jan 2026 10:42:16 +0800
Subject: [PATCH 2/2] chore (MainWindow.xaml):Delete unuseful string

Signed-off-by: doudou0720 <98651603+doudou0720@users.noreply.github.com>
---
 Ink Canvas/MainWindow.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Ink Canvas/MainWindow.xaml b/Ink Canvas/MainWindow.xaml
index 5c385d98..99be5b12 100644
--- a/Ink Canvas/MainWindow.xaml	
+++ b/Ink Canvas/MainWindow.xaml	
@@ -860,7 +860,7 @@
                                                          IsOn="False" FontFamily="Microsoft YaHei UI" FontWeight="Bold"
                                                          Toggled="ToggleSwitchHideInkFadeControlInPenMenu_Toggled" />
                                     </ui:SimpleStackPanel>
-                                    <TextBlock Text="# 开启后，主工具栏上点击笔工具后弹出的上下文菜单中将不显示墨迹渐隐控制开关，可以有效防止课间老是有人玩墨迹渐隐功能" TextWrapping="Wrap" Foreground="#a1a1aa" />
+                                    <TextBlock Text="# 开启后，主工具栏上点击笔工具后弹出的上下文菜单中将不显示墨迹渐隐控制开关" TextWrapping="Wrap" Foreground="#a1a1aa" />
 
                                 </ui:SimpleStackPanel>
                             </GroupBox>