diff --git a/designer-base/src/main/java/com/fr/design/style/color/ColorPicker.java b/designer-base/src/main/java/com/fr/design/style/color/ColorPicker.java
index baf7920e14..067d82f9ce 100644
--- a/designer-base/src/main/java/com/fr/design/style/color/ColorPicker.java
+++ b/designer-base/src/main/java/com/fr/design/style/color/ColorPicker.java
@@ -67,13 +67,10 @@ public class ColorPicker extends JDialog implements ActionListener {
         hideCursor();
 
         // 如果要求实时变化，确保先关闭弹窗，再截屏
-        // 主要针对"图案"选项卡中的"前景"、"背景"
         if (this.setColorRealTime) {
             colorSelectable.setColor(Color.WHITE);  // setColor 可以关闭弹窗
             // REPORT-82110 确保关闭所有弹窗后截屏
-            SwingUtilities.invokeLater(() -> {
-                colorPickerPanel.captureScreen();
-            });
+            SwingUtilities.invokeLater(colorPickerPanel :: captureScreen);
         }
     }
 
diff --git a/designer-base/src/main/java/com/fr/design/style/color/UIToolbarColorButton.java b/designer-base/src/main/java/com/fr/design/style/color/UIToolbarColorButton.java
index 11fe154469..8627f27a5f 100644
--- a/designer-base/src/main/java/com/fr/design/style/color/UIToolbarColorButton.java
+++ b/designer-base/src/main/java/com/fr/design/style/color/UIToolbarColorButton.java
@@ -153,12 +153,13 @@ public class UIToolbarColorButton extends UICombinationButton implements PopupHi
         popupWin = null;
     }
 
-    // 取色器取色时，隐藏弹出框，无需经过macOS的判断
+    /**
+     * 取色器取色时隐藏弹出框，与另一个hide的区别是无需经过macOS的判断，以规避REPORT-25645的mac适配bug
+     */
     public void hidePopupMenu4PickColor() {
         if (popupWin != null) {
             popupWin.setVisible(false);
         }
-
         popupWin = null;
     }