diff options
Diffstat (limited to 'dozentenmodul/src/main/java')
| -rw-r--r-- | dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java index 871b218c..bc3e4554 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java @@ -24,7 +24,6 @@ import javax.swing.JPanel; import javax.swing.JSeparator; import org.apache.log4j.Logger; -import org.apache.thrift.TException; import org.openslx.bwlp.thrift.iface.WhoamiInfo; import org.openslx.dozmod.App; import org.openslx.dozmod.Config; @@ -182,12 +181,15 @@ public abstract class MainWindow { askApplicationQuit(); } event.consume(); - } else if (code == 27 && type == KeyEvent.KEY_PRESSED) { - Window window = KeyboardFocusManager.getCurrentKeyboardFocusManager().getActiveWindow(); - if (window instanceof UiFeedback) { - ((UiFeedback) window).escapePressed(); - event.consume(); + } else if (code == 27 || code == 23) { // ESC or Ctrl-W closes current window + if (type == KeyEvent.KEY_PRESSED) { + Window window = KeyboardFocusManager.getCurrentKeyboardFocusManager() + .getActiveWindow(); + if (window instanceof UiFeedback) { + ((UiFeedback) window).escapePressed(); + } } + event.consume(); } return event.isConsumed(); } |