From d31f40408baf8183082f453c1976f27c9c0d8e07 Mon Sep 17 00:00:00 2001 From: CJKmkp <2564608840@qq.com> Date: Tue, 29 Jul 2025 17:59:41 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=9B=BE=E7=89=87=E5=A2=A8=E8=BF=B9?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MainWindow_cs/MW_FloatingBarIcons.cs | 19 ++---------------- ...vasForClass.csproj.AssemblyReference.cache | Bin 35374 -> 35404 bytes 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs b/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs index 8f27b792..bafc0805 100644 --- a/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs +++ b/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs @@ -1780,20 +1780,13 @@ namespace Ink_Canvas { AnimationsHelper.HideWithSlideAndFade(BlackboardLeftSide); AnimationsHelper.HideWithSlideAndFade(BlackboardCenterSide); AnimationsHelper.HideWithSlideAndFade(BlackboardRightSide); - - // 取消任何UI元素的选择 + DeselectUIElement(); SaveStrokes(true); ClearStrokes(true); - - // 总是恢复备份墨迹，不管是否在PPT模式 - // PPT墨迹和白板墨迹应该分别管理，不应该互相影响 RestoreStrokes(true); - LogHelper.WriteLogToFile($"退出白板模式，恢复备份墨迹。当前模式：{(BtnPPTSlideShowEnd.Visibility == Visibility.Visible ? "PPT放映" : "桌面")}", LogHelper.LogType.Trace); - - // 注释掉：退出白板时不应该清空图片，因为RestoreStrokes()已经恢复了正确的状态 - // inkCanvas.Children.Clear(); + if (BtnSwitchTheme.Content.ToString() == "浅色") { BtnSwitch.Content = "黑板"; @@ -1831,14 +1824,7 @@ namespace Ink_Canvas { SaveStrokes(); ClearStrokes(true); - - // 总是恢复备份墨迹，不管是否在PPT模式 - // PPT墨迹和白板墨迹应该分别管理，不应该互相影响 RestoreStrokes(true); - LogHelper.WriteLogToFile($"切换到桌面模式，恢复备份墨迹。当前模式：{(BtnPPTSlideShowEnd.Visibility == Visibility.Visible ? "PPT放映" : "桌面")}", LogHelper.LogType.Trace); - - // 注释掉：退出白板时不应该清空图片，因为RestoreStrokes()已经恢复了正确的状态 - // inkCanvas.Children.Clear(); if (BtnSwitchTheme.Content.ToString() == "浅色") { BtnSwitch.Content = "黑板"; @@ -1876,7 +1862,6 @@ namespace Ink_Canvas { // 总是恢复备份墨迹，不管是否在PPT模式 // PPT墨迹和白板墨迹应该分别管理，不应该互相影响 RestoreStrokes(); - LogHelper.WriteLogToFile($"进入白板模式，恢复备份墨迹。当前模式：{(BtnPPTSlideShowEnd.Visibility == Visibility.Visible ? "PPT放映" : "桌面")}", LogHelper.LogType.Trace); BtnSwitch.Content = "屏幕"; if (BtnSwitchTheme.Content.ToString() == "浅色") { diff --git a/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.AssemblyReference.cache b/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.AssemblyReference.cache index 4af914e22079d93b58f0e03491291464a0dba41e..2631e131b8cff64b6949ef6a68518314d6da74c5 100644 GIT binary patch delta 112 zcmZ2Ch3U)`rU~a5ttOt=W=Y8`E}8h#lhJ9i4T~{1h^O!A=$v1aI$1wnbMgX~zRku= o6Brq7U}`77WAzg=yUsrU~a5O(&k$p7`H`(RQ*oi}B_LMqegIbD+@Vf6P9N_8>71Pe-5p#FW&c h$%a9ilh-r$ZFXXv&d6v6QpCmX#b^iC*vr1Z2>>6Y9fJS>