From 84edb7bbe687c5c19c103581883b8500ca99b884 Mon Sep 17 00:00:00 2001
From: CJKmkp <2564608840@qq.com>
Date: Sat, 23 Aug 2025 18:39:12 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=BF=AB=E6=8D=B7=E8=B0=83=E8=89=B2?=
 =?UTF-8?q?=E6=9D=BF=E4=B8=8D=E6=94=AF=E6=8C=81=E8=8D=A7=E5=85=89=E7=AC=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Ink Canvas/MainWindow_cs/MW_Colors.cs         |  3 +++
 .../MainWindow_cs/MW_FloatingBarIcons.cs      | 22 ++++++++++++++-----
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/Ink Canvas/MainWindow_cs/MW_Colors.cs b/Ink Canvas/MainWindow_cs/MW_Colors.cs
index 07b4570a..4c003865 100644
--- a/Ink Canvas/MainWindow_cs/MW_Colors.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_Colors.cs	
@@ -595,6 +595,9 @@ namespace Ink_Canvas
             drawingAttributes.Height = Settings.Canvas.HighlighterWidth;
             drawingAttributes.StylusTip = StylusTip.Rectangle;
             drawingAttributes.IsHighlighter = true;
+            
+            // 确保荧光笔模式切换后正确更新颜色和快捷调色板指示器
+            ColorSwitchCheck();
         }
 
         private void BtnColorBlack_Click(object sender, RoutedEventArgs e)
diff --git a/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs b/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs
index a6799df9..9d32dd4e 100644
--- a/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs	
@@ -2011,8 +2011,10 @@ namespace Ink_Canvas
                 {
                     highlighterColor = 103; // 黄色荧光笔
                 }
-                else if (color == Color.FromRgb(255, 165, 0) || IsColorSimilar(color, Color.FromRgb(249, 115, 22), 15) ||
-                         IsColorSimilar(color, Color.FromRgb(234, 88, 12), 15))
+                else if (color == Color.FromRgb(255, 165, 0) || IsColorSimilar(color, Color.FromRgb(249, 115, 22), 20) ||
+                         IsColorSimilar(color, Color.FromRgb(234, 88, 12), 20) ||
+                         IsColorSimilar(color, Color.FromRgb(251, 146, 60), 20) ||
+                         IsColorSimilar(color, Color.FromRgb(253, 126, 20), 20))
                 {
                     highlighterColor = 109; // 橙色荧光笔
                 }
@@ -2044,6 +2046,9 @@ namespace Ink_Canvas
                 inkCanvas.DefaultDrawingAttributes.Height = Settings.Canvas.HighlighterWidth;
                 inkCanvas.DefaultDrawingAttributes.StylusTip = StylusTip.Rectangle;
                 inkCanvas.DefaultDrawingAttributes.IsHighlighter = true;
+                
+                // 确保荧光笔颜色索引正确更新
+                inkCanvas.DefaultDrawingAttributes.Color = drawingAttributes.Color;
             }
 
             // 更新颜色状态
@@ -2077,6 +2082,12 @@ namespace Ink_Canvas
 
             // 更新颜色显示
             ColorSwitchCheck();
+            
+            // 如果当前是荧光笔模式，调用ColorSwitchCheck确保颜色索引正确更新
+            if (penType == 1)
+            {
+                ColorSwitchCheck();
+            }
         }
 
         private void UpdateQuickColorPaletteIndicator(Color selectedColor)
@@ -2123,7 +2134,9 @@ namespace Ink_Canvas
             }
             else if (IsColorSimilar(selectedColor, Color.FromRgb(255, 165, 0), tolerance) || 
                      IsColorSimilar(selectedColor, Color.FromRgb(249, 115, 22), tolerance) ||
-                     IsColorSimilar(selectedColor, Color.FromRgb(234, 88, 12), tolerance))
+                     IsColorSimilar(selectedColor, Color.FromRgb(234, 88, 12), tolerance) ||
+                     IsColorSimilar(selectedColor, Color.FromRgb(251, 146, 60), tolerance) ||
+                     IsColorSimilar(selectedColor, Color.FromRgb(253, 126, 20), tolerance))
             {
                 QuickColorOrangeCheck.Visibility = Visibility.Visible;
                 QuickColorOrangeCheckSingle.Visibility = Visibility.Visible;
@@ -2140,8 +2153,7 @@ namespace Ink_Canvas
                 QuickColorRedCheck.Visibility = Visibility.Visible;
                 QuickColorRedCheckSingle.Visibility = Visibility.Visible;
             }
-            else if (IsColorSimilar(selectedColor, Colors.Green, tolerance) || 
-                     IsColorSimilar(selectedColor, Color.FromRgb(22, 163, 74), tolerance))
+            else if (IsColorSimilar(selectedColor, Color.FromRgb(22, 163, 74), tolerance))
             {
                 QuickColorGreenCheck.Visibility = Visibility.Visible;
                 QuickColorGreenCheckSingle.Visibility = Visibility.Visible;