From 888488b9e87cac871d90546cb9eb22acb63e9bf9 Mon Sep 17 00:00:00 2001
From: hades <Hades@fanruan.com>
Date: Fri, 23 Jul 2021 12:53:13 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-55492=20=E3=80=90=E4=BA=A4=E4=BA=92?=
 =?UTF-8?q?=E9=AA=8C=E6=94=B6=E3=80=91=E3=80=90=E7=BB=84=E4=BB=B6=E8=83=8C?=
 =?UTF-8?q?=E6=99=AF=E5=88=86=E7=A6=BB=E3=80=91macos=E4=B8=AD=E5=B0=8F?=
 =?UTF-8?q?=E5=B7=A5=E5=85=B7=E6=A0=8F=E7=9A=84=E6=8C=89=E9=92=AE=E5=8C=BA?=
 =?UTF-8?q?=E5=9F=9F=E6=B5=AE=E5=88=B0=E6=9C=80=E4=B8=8A=E9=9D=A2=E6=9D=A5?=
 =?UTF-8?q?=E4=BA=86=EF=BC=88=E5=BA=94=E8=AF=A5=E8=A2=ABdialog=E8=A6=86?=
 =?UTF-8?q?=E7=9B=96=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/fr/design/mainframe/DesignerFrame.java    | 6 ++++++
 .../java/com/fr/design/designer/ui/SelectedPopupDialog.java | 5 ++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java b/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java
index 890b6fa04b..b7bc518385 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java
@@ -212,6 +212,12 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
             }
         }
 
+        @Override
+        public void windowIconified(WindowEvent e) {
+            // 最小化时 hide工具栏
+            HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().fireTabChange();
+        }
+
     };
 
     private JComponent closeButton = new JComponent() {
diff --git a/designer-form/src/main/java/com/fr/design/designer/ui/SelectedPopupDialog.java b/designer-form/src/main/java/com/fr/design/designer/ui/SelectedPopupDialog.java
index 285bbc3b8b..44978ad667 100644
--- a/designer-form/src/main/java/com/fr/design/designer/ui/SelectedPopupDialog.java
+++ b/designer-form/src/main/java/com/fr/design/designer/ui/SelectedPopupDialog.java
@@ -3,8 +3,11 @@ package com.fr.design.designer.ui;
 import com.fr.design.designer.creator.XCreator;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.FormDesigner;
+import com.fr.stable.os.OperatingSystem;
+
 import java.awt.Rectangle;
 import javax.swing.JDialog;
+import javax.swing.JFrame;
 
 /**
  * @author hades
@@ -23,7 +26,7 @@ public class SelectedPopupDialog extends JDialog {
     private boolean canVisible = true;
 
     public SelectedPopupDialog(XCreator creator, FormDesigner designer) {
-        super(DesignerContext.getDesignerFrame());
+        super(OperatingSystem.isMacos() ? new JFrame() : DesignerContext.getDesignerFrame());
         this.setUndecorated(true);
         this.setModal(false);
         this.setFocusableWindowState(false);