external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 12:48:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Close FDialogs when Escape key pressed

Browse Source
This commit is contained in:
drdev
2013-12-24 18:38:11 +00:00
parent f7d1b73a6c
commit 891db98700
1 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
forge-gui/src/main/java/forge/view/FDialog.java
View File

@@ -7,15 +7,20 @@ import java.awt.Graphics2D;
import java.awt.GraphicsDevice; import java.awt.GraphicsDevice;
import java.awt.GraphicsEnvironment; import java.awt.GraphicsEnvironment;
import java.awt.Image; import java.awt.Image;
import java.awt.KeyEventDispatcher;
import java.awt.KeyboardFocusManager;
import java.awt.Point; import java.awt.Point;
import java.awt.PopupMenu; import java.awt.PopupMenu;
import java.awt.RenderingHints; import java.awt.RenderingHints;
import java.awt.Toolkit;
import java.awt.GraphicsDevice.WindowTranslucency; import java.awt.GraphicsDevice.WindowTranslucency;
import java.awt.event.ComponentAdapter; import java.awt.event.ComponentAdapter;
import java.awt.event.ComponentEvent; import java.awt.event.ComponentEvent;
import java.awt.event.KeyEvent;
import java.awt.event.MouseAdapter; import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent; import java.awt.event.MouseEvent;
import java.awt.event.MouseMotionAdapter; import java.awt.event.MouseMotionAdapter;
import java.awt.event.WindowEvent;
import java.awt.geom.RoundRectangle2D; import java.awt.geom.RoundRectangle2D;
import javax.swing.JDialog; import javax.swing.JDialog;
@@ -28,7 +33,7 @@ import forge.gui.toolbox.FPanel;
import forge.gui.toolbox.FSkin; import forge.gui.toolbox.FSkin;
@SuppressWarnings("serial") @SuppressWarnings("serial")
public class FDialog extends JDialog implements ITitleBarOwner { public class FDialog extends JDialog implements ITitleBarOwner, KeyEventDispatcher {
private static final FSkin.SkinColor borderColor = FSkin.getColor(FSkin.Colors.CLR_BORDERS); private static final FSkin.SkinColor borderColor = FSkin.getColor(FSkin.Colors.CLR_BORDERS);
private static final int cornerDiameter = 20; private static final int cornerDiameter = 20;
private static final boolean isSetShapeSupported; private static final boolean isSetShapeSupported;
@@ -76,6 +81,19 @@ public class FDialog extends JDialog implements ITitleBarOwner {
} }
} }
//Make Escape key close dialog if allowed
@Override
public boolean dispatchKeyEvent(KeyEvent e) {
if (e.getID() == KeyEvent.KEY_PRESSED) {
if (e.getKeyCode() == KeyEvent.VK_ESCAPE) {
WindowEvent wev = new WindowEvent(this, WindowEvent.WINDOW_CLOSING);
Toolkit.getDefaultToolkit().getSystemEventQueue().postEvent(wev);
return true;
}
}
return false;
}
@Override @Override
public void paint(Graphics g) { public void paint(Graphics g) {
super.paint(g); super.paint(g);
@@ -105,12 +123,16 @@ public class FDialog extends JDialog implements ITitleBarOwner {
if (visible) { if (visible) {
setLocationRelativeTo(JOptionPane.getRootFrame()); setLocationRelativeTo(JOptionPane.getRootFrame());
KeyboardFocusManager.getCurrentKeyboardFocusManager().addKeyEventDispatcher(this); //support handling keyboard shortcuts in dialog
if (isModal()) { if (isModal()) {
SOverlayUtils.showOverlay(); SOverlayUtils.showOverlay();
} }
} }
else if (isModal()) { else {
SOverlayUtils.hideOverlay(); KeyboardFocusManager.getCurrentKeyboardFocusManager().removeKeyEventDispatcher(this);
if (isModal()) {
SOverlayUtils.hideOverlay();
}
} }
super.setVisible(visible); super.setVisible(visible);
} }