diff --git a/Ink Canvas/Helpers/DeviceIdentifier.cs b/Ink Canvas/Helpers/DeviceIdentifier.cs index 0fc47e56..4929c50c 100644 --- a/Ink Canvas/Helpers/DeviceIdentifier.cs +++ b/Ink Canvas/Helpers/DeviceIdentifier.cs @@ -1065,7 +1065,6 @@ namespace Ink_Canvas.Helpers // 如果不是自动更新(即版本修复),则应用不同的策略 if (!isAutoUpdate) { - // 版本修复:立即允许,不受分级策略影响 LogHelper.WriteLogToFile($"DeviceIdentifier | 版本修复 - 版本: {updateVersion}, 类型: {updateType}, 结果: 允许"); return true; } diff --git a/Ink Canvas/MainWindow_cs/MW_AutoFold.cs b/Ink Canvas/MainWindow_cs/MW_AutoFold.cs index c77c56c3..6c4187c3 100644 --- a/Ink Canvas/MainWindow_cs/MW_AutoFold.cs +++ b/Ink Canvas/MainWindow_cs/MW_AutoFold.cs @@ -305,7 +305,6 @@ namespace Ink_Canvas SidePannelMarginAnimation(-50, !unfoldFloatingBarByUser); }); - // 修复:在浮动栏展开后,重新设置按钮高亮状态 await Dispatcher.InvokeAsync(async () => { try diff --git a/Ink Canvas/MainWindow_cs/MW_BoardIcons.cs b/Ink Canvas/MainWindow_cs/MW_BoardIcons.cs index ab4a399e..329c8733 100644 --- a/Ink Canvas/MainWindow_cs/MW_BoardIcons.cs +++ b/Ink Canvas/MainWindow_cs/MW_BoardIcons.cs @@ -726,7 +726,6 @@ namespace Ink_Canvas SetCurrentToolMode(InkCanvasEditingMode.EraseByStroke); drawingShapeMode = 0; - // 修复:切换到线擦时,确保重置笔的状态 penType = 0; drawingAttributes.IsHighlighter = false; drawingAttributes.StylusTip = StylusTip.Ellipse; diff --git a/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs b/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs index 6057b22f..060994ab 100644 --- a/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs +++ b/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs @@ -1875,8 +1875,6 @@ namespace Ink_Canvas // 更新模式缓存,确保后续的模式检测正确 UpdateCurrentToolMode("cursor"); - // 修复:在浮动栏收起状态下,仍然需要设置按钮高亮状态 - // 这样在浮动栏展开时能正确显示高光 SetFloatingBarHighlightPosition("cursor"); // 切换前自动截图保存墨迹 @@ -2072,8 +2070,6 @@ namespace Ink_Canvas } } - // 修复:从线擦切换到批注时,保持之前的笔类型状态 - // 如果之前是荧光笔模式,则保持荧光笔状态;否则重置为默认笔模式 forceEraser = false; forcePointEraser = false; drawingShapeMode = 0; @@ -2101,7 +2097,6 @@ namespace Ink_Canvas { if (wasInInkMode) { - // 修复:从线擦切换到批注时,确保正确重置状态 if (forceEraser) { // 从橡皮擦模式切换过来,保持之前的笔类型状态 @@ -2179,7 +2174,6 @@ namespace Ink_Canvas // 更新模式缓存 UpdateCurrentToolMode("pen"); - // 修复:从线擦切换到批注时,保持之前的笔类型状态 forceEraser = false; forcePointEraser = false; drawingShapeMode = 0; @@ -2206,7 +2200,6 @@ namespace Ink_Canvas } - // 修复:从线擦切换到批注时,保持之前的笔类型状态 forceEraser = false; forcePointEraser = false; drawingShapeMode = 0; @@ -2333,7 +2326,6 @@ namespace Ink_Canvas drawingShapeMode = 0; - // 修复:切换到线擦时,保存当前的笔类型状态,而不是强制重置 // 这样从线擦切换回批注时,可以恢复之前的荧光笔状态 // penType 和 drawingAttributes 的状态将在 PenIcon_Click 中根据 wasHighlighter 来恢复 diff --git a/Ink Canvas/MainWindow_cs/MW_Settings.cs b/Ink Canvas/MainWindow_cs/MW_Settings.cs index f400141b..48b22800 100644 --- a/Ink Canvas/MainWindow_cs/MW_Settings.cs +++ b/Ink Canvas/MainWindow_cs/MW_Settings.cs @@ -2961,7 +2961,6 @@ namespace Ink_Canvas } // 重新计算浮动栏位置,因为按钮可见性变化会影响浮动栏宽度 - // 修复:移除浮动栏收起状态检查,确保在收起状态下也能正确修正位置 if (currentMode == 0) // 只在屏幕模式下重新计算浮动栏位置 { if (BtnPPTSlideShowEnd.Visibility == Visibility.Visible)