From 828671fce4d3f9d67203d6474450d0019aaf8a9f Mon Sep 17 00:00:00 2001 From: levy Date: Mon, 24 Oct 2022 18:33:07 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-82110=20=E8=AE=BE=E8=AE=A1=E5=99=A8?= =?UTF-8?q?=E5=8F=96=E8=89=B2bug=20=E3=80=90=E9=97=AE=E9=A2=98=E5=8E=9F?= =?UTF-8?q?=E5=9B=A0=E3=80=91=E5=8F=96=E8=89=B2=E5=99=A8ColorPicker?= =?UTF-8?q?=E5=8F=96=E8=89=B2=E6=98=AF=E5=9F=BA=E4=BA=8E=E6=88=AA=E5=B1=8F?= =?UTF-8?q?=E5=90=8E=E8=AF=BB=E5=8F=96=E9=A2=9C=E8=89=B2=E7=9A=84=EF=BC=8C?= =?UTF-8?q?=E5=9B=A0=E6=AD=A4=E9=9C=80=E7=A1=AE=E4=BF=9D=E5=BC=B9=E5=87=BA?= =?UTF-8?q?=E6=A1=86=E5=85=A8=E9=83=A8=E5=85=B3=E9=97=AD=E5=90=8E=E6=88=AA?= =?UTF-8?q?=E5=B1=8F=E3=80=82=20=E3=80=90=E6=94=B9=E5=8A=A8=E6=80=9D?= =?UTF-8?q?=E8=B7=AF=E3=80=911=E3=80=81=E5=8F=96=E8=89=B2=E5=89=8D?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0hidePopupMenu=E7=9A=84=E6=93=8D=E4=BD=9C=202?= =?UTF-8?q?=E3=80=81=E4=BD=BF=E7=94=A8invokeLater=E7=A1=AE=E4=BF=9D?= =?UTF-8?q?=E5=BC=82=E6=AD=A5=E4=BB=BB=E5=8A=A1=E6=89=A7=E8=A1=8C=E5=AE=8C?= =?UTF-8?q?=E6=88=90=E5=90=8E=E6=88=AA=E5=B1=8F=203=E3=80=81=E4=B8=BA?= =?UTF-8?q?=E8=A7=84=E9=81=BFREPORT-25645=E7=9A=84macOS=E9=80=82=E9=85=8D?= =?UTF-8?q?=E9=97=AE=E9=A2=98,=E6=96=B0=E5=A2=9EhidePopupMenu4PickColor?= =?UTF-8?q?=E7=9A=84=E6=96=B9=E6=B3=95=20=E3=80=90Review=E5=BB=BA=E8=AE=AE?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/style/color/ColorPicker.java | 5 +---- .../java/com/fr/design/style/color/UIToolbarColorButton.java | 5 +++-- 2 files changed, 4 insertions(+), 6 deletions(-) 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 baf7920e1..067d82f9c 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 11fe15446..8627f27a5 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; }