From 7897cd7e0c0b1f3a99bd5ba4e3565e72776d159c Mon Sep 17 00:00:00 2001 From: Konstantin Bulenkov Date: Mon, 31 Jan 2011 12:53:22 +0300 Subject: [PATCH] IDEA-64501 Context menu keyboard button shows context menu, but focus is still in editor --- .../src/com/intellij/openapi/editor/impl/EditorImpl.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java index af207585d4a5..45c1d6e8c2dd 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java @@ -3354,7 +3354,10 @@ public final class EditorImpl extends UserDataHolderBase implements EditorEx, Hi } private void requestFocus() { - IdeFocusManager.getInstance(myProject).requestFocus(myEditorComponent, true); + final IdeFocusManager focusManager = IdeFocusManager.getInstance(myProject); + if (focusManager.getFocusOwner() != myEditorComponent) { //IDEA-64501 + focusManager.requestFocus(myEditorComponent, true); + } } private void validateMousePointer(MouseEvent e) {