From b42db51346316ae0005993d952ed619b9367d0c1 Mon Sep 17 00:00:00 2001
From: CJKmkp <2564608840@qq.com>
Date: Thu, 2 Oct 2025 15:05:55 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=BF=BD=E7=95=A5=E5=B8=8C=E6=B2=83?=
 =?UTF-8?q?=E7=99=BD=E6=9D=BF=E4=BA=94=E6=A1=8C=E9=9D=A2=E6=89=B9=E6=B3=A8?=
 =?UTF-8?q?=E7=AA=97=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Ink Canvas/MainWindow_cs/MW_Timer.cs | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/Ink Canvas/MainWindow_cs/MW_Timer.cs b/Ink Canvas/MainWindow_cs/MW_Timer.cs
index bf4cc41a..309f239b 100644
--- a/Ink Canvas/MainWindow_cs/MW_Timer.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_Timer.cs	
@@ -473,10 +473,22 @@ namespace Ink_Canvas
                         Trace.WriteLine(ForegroundWindowInfo.ProcessPath());
                         Trace.WriteLine(version);
                         Trace.WriteLine(prodName);
-                        if (version.StartsWith("5.") && Settings.Automation.IsAutoFoldInEasiNote && (!(windowTitle.Length == 0 && ForegroundWindowInfo.WindowRect().Height < 500) ||
-                                                         !Settings.Automation.IsAutoFoldInEasiNoteIgnoreDesktopAnno))
+                        if (version.StartsWith("5.") && Settings.Automation.IsAutoFoldInEasiNote)
                         { // EasiNote5
-                            if (!unfoldFloatingBarByUser && !isFloatingBarFolded) FoldFloatingBar_MouseUp(null, null);
+                            // 检查是否是桌面批注窗口
+                            bool isAnnotationWindow = windowTitle.Length == 0 && ForegroundWindowInfo.WindowRect().Height < 500;
+                            
+                            // 如果启用了忽略桌面批注窗口功能，且当前是批注窗口
+                            if (Settings.Automation.IsAutoFoldInEasiNoteIgnoreDesktopAnno && isAnnotationWindow)
+                            {
+                                // 强制保持收纳状态
+                                if (!isFloatingBarFolded) FoldFloatingBar_MouseUp(null, null);
+                            }
+                            else if (!isAnnotationWindow)
+                            {
+                                // 非批注窗口时正常收纳
+                                if (!unfoldFloatingBarByUser && !isFloatingBarFolded) FoldFloatingBar_MouseUp(null, null);
+                            }
                         }
                         else if (version.StartsWith("3.") && Settings.Automation.IsAutoFoldInEasiNote3)
                         { // EasiNote3