From 08b2cb90fadf9d5d5ce95a241404355bf8580095 Mon Sep 17 00:00:00 2001 From: "Richard.Fang" Date: Mon, 10 Feb 2025 16:49:12 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-147520=20fix:=E6=8A=98=E5=8F=A0=E5=BC=B9?= =?UTF-8?q?=E7=AA=97=E5=A2=9E=E5=8A=A0esc=E9=80=80=E5=87=BA=E6=93=8D?= =?UTF-8?q?=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/dialog/CollapsibleDetailDialog.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/dialog/CollapsibleDetailDialog.java b/designer-base/src/main/java/com/fr/design/dialog/CollapsibleDetailDialog.java index cc73abc36d..01d3b6f08e 100644 --- a/designer-base/src/main/java/com/fr/design/dialog/CollapsibleDetailDialog.java +++ b/designer-base/src/main/java/com/fr/design/dialog/CollapsibleDetailDialog.java @@ -11,15 +11,21 @@ import com.fr.design.gui.ilable.UILabel; import com.fr.design.i18n.Toolkit; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.utils.gui.GUICoreUtils; -import java.awt.*; -import java.awt.event.ActionEvent; +import java.awt.Frame; +import java.awt.Dimension; +import java.awt.BorderLayout; +import java.awt.Color; import java.awt.event.ActionListener; +import java.awt.event.ActionEvent; +import java.awt.event.KeyEvent; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import javax.swing.JPanel; import javax.swing.JDialog; import javax.swing.JScrollPane; import javax.swing.JTextArea; +import javax.swing.KeyStroke; +import javax.swing.JComponent; import static com.fine.swing.ui.layout.Layouts.cell; @@ -70,6 +76,7 @@ public class CollapsibleDetailDialog extends JDialog implements ActionListener { this.setSize(this.collapseDimension); GUICoreUtils.centerWindow(this); this.setAlwaysOnTop(true); + this.getRootPane().registerKeyboardAction(e -> dispose(), KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), JComponent.WHEN_IN_FOCUSED_WINDOW); } private void initTopPanel() {