From 78059e5408edd43dfb67bba62d780f82cf00c106 Mon Sep 17 00:00:00 2001 From: Konstantin Bulenkov Date: Sun, 5 Feb 2012 11:48:37 +0100 Subject: [PATCH] fix Escape in dialogs, etc --- platform/platform-api/src/com/intellij/ui/MouseDragHelper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/platform-api/src/com/intellij/ui/MouseDragHelper.java b/platform/platform-api/src/com/intellij/ui/MouseDragHelper.java index 0d8a3aac1c45..bb0ccb0cb25a 100644 --- a/platform/platform-api/src/com/intellij/ui/MouseDragHelper.java +++ b/platform/platform-api/src/com/intellij/ui/MouseDragHelper.java @@ -255,7 +255,7 @@ public abstract class MouseDragHelper implements MouseListener, MouseMotionListe @Override public boolean dispatchKeyEvent(KeyEvent e) { - if (e.getKeyCode() == KeyEvent.VK_ESCAPE && e.getID() == KeyEvent.KEY_PRESSED) { + if (e.getKeyCode() == KeyEvent.VK_ESCAPE && e.getID() == KeyEvent.KEY_PRESSED && myDraggingNow) { myCancelled = true; if (myDetachingMode) { processDragOutCancel();