diff --git a/src/main/java/ui/window/JDialogPerformancePragma.java b/src/main/java/ui/window/JDialogPerformancePragma.java index 5c3c0606c50e2cb1d756b86c756b75943c6b7514..8ba2c133c98a3663824b98b6947b8823e56048ac 100644 --- a/src/main/java/ui/window/JDialogPerformancePragma.java +++ b/src/main/java/ui/window/JDialogPerformancePragma.java @@ -385,6 +385,15 @@ public class JDialogPerformancePragma extends JDialogBase implements ActionListe help(); } }); + + helpPopup.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke("ESCAPE"), "closeJlabel"); + helpPopup.getActionMap().put("closeJlabel", new AbstractAction() { + @Override + public void actionPerformed(ActionEvent e) { + helpPopup.setVisible(false); + } + }); + JPanel jp = new JPanel(); jp.add(cancel); jp.add(close); diff --git a/src/main/java/ui/window/JDialogSafetyPragma.java b/src/main/java/ui/window/JDialogSafetyPragma.java index d4dd7a5cf17c6e367adf3d191a5e8b6f0e97dc5d..9c526cda8efb2793e9182915205d30f103ff938c 100644 --- a/src/main/java/ui/window/JDialogSafetyPragma.java +++ b/src/main/java/ui/window/JDialogSafetyPragma.java @@ -365,6 +365,15 @@ public class JDialogSafetyPragma extends JDialogBase implements ActionListener { help(); } }); + + helpPopup.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke("ESCAPE"), "closeJlabel"); + helpPopup.getActionMap().put("closeJlabel", new AbstractAction() { + @Override + public void actionPerformed(ActionEvent e) { + helpPopup.setVisible(false); + } + }); + JPanel jp = new JPanel(); jp.add(cancel); jp.add(close);