From c68694f4da707395c3d1af44e842ef2a64f5bc84 Mon Sep 17 00:00:00 2001 From: "Vassiliy.Kudryashov" Date: Thu, 26 May 2016 19:05:51 +0300 Subject: [PATCH] IDEA-144702 Unable to use Windows as a modifier key in keymap After-review fix for event modifiers --- .../platform-impl/src/com/intellij/ide/IdeEventQueue.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/ide/IdeEventQueue.java b/platform/platform-impl/src/com/intellij/ide/IdeEventQueue.java index 8c2219427ea1..fc63e4e8523c 100644 --- a/platform/platform-impl/src/com/intellij/ide/IdeEventQueue.java +++ b/platform/platform-impl/src/com/intellij/ide/IdeEventQueue.java @@ -526,11 +526,11 @@ public class IdeEventQueue extends EventQueue { if (ke.getKeyCode() == KeyEvent.VK_WINDOWS) { if (ke.getID() == KeyEvent.KEY_PRESSED) myWinMetaPressed = true; if (ke.getID() == KeyEvent.KEY_RELEASED) myWinMetaPressed = false; - return new KeyEvent(ke.getComponent(), ke.getID(), ke.getWhen(), ke.getModifiers(), KeyEvent.VK_META, ke.getKeyChar(), + return new KeyEvent(ke.getComponent(), ke.getID(), ke.getWhen(), ke.getModifiers() | ke.getModifiersEx(), KeyEvent.VK_META, ke.getKeyChar(), ke.getKeyLocation()); } if (myWinMetaPressed) { - return new KeyEvent(ke.getComponent(), ke.getID(), ke.getWhen(), ke.getModifiers() | InputEvent.META_MASK, ke.getKeyCode(), + return new KeyEvent(ke.getComponent(), ke.getID(), ke.getWhen(), ke.getModifiers() | ke.getModifiersEx() | InputEvent.META_MASK, ke.getKeyCode(), ke.getKeyChar(), ke.getKeyLocation()); } }