summaryrefslogtreecommitdiffstats
path: root/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java
diff options
context:
space:
mode:
authorSimon Rettberg2015-10-01 15:36:23 +0200
committerSimon Rettberg2015-10-01 15:36:23 +0200
commit5f2ae4eb1388af9a7859031a7e51bd0c4b08c618 (patch)
tree02bcf86374163654bcfa5663f5fbfb7e174f6042 /dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java
parent[server] Don't accidentally overwrite email address of imported account if us... (diff)
downloadtutor-module-5f2ae4eb1388af9a7859031a7e51bd0c4b08c618.tar.gz
tutor-module-5f2ae4eb1388af9a7859031a7e51bd0c4b08c618.tar.xz
tutor-module-5f2ae4eb1388af9a7859031a7e51bd0c4b08c618.zip
[client] Fix escape not working in message boxes
Diffstat (limited to 'dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java')
-rw-r--r--dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java4
1 files changed, 2 insertions, 2 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 824a3404..3577d1ba 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java
@@ -177,17 +177,17 @@ public abstract class MainWindow {
if (type == KeyEvent.KEY_RELEASED && !isQuitQuestionOpen) {
isQuitQuestionOpen = true;
askApplicationQuit();
+ event.consume();
}
- 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();
}
}
- event.consume();
}
return event.isConsumed();
}