From 7e1ce96a3d05e6a648bb3e3c4db29e1a06e65e43 Mon Sep 17 00:00:00 2001 From: Denis Fokin Date: Tue, 25 Mar 2014 17:24:34 +0400 Subject: [PATCH] Focus was broken for F12 on Windows. --- .../src/com/intellij/openapi/wm/FocusCommand.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/platform/platform-api/src/com/intellij/openapi/wm/FocusCommand.java b/platform/platform-api/src/com/intellij/openapi/wm/FocusCommand.java index dfbf3ddd486b..13269fee8c5a 100644 --- a/platform/platform-api/src/com/intellij/openapi/wm/FocusCommand.java +++ b/platform/platform-api/src/com/intellij/openapi/wm/FocusCommand.java @@ -182,8 +182,10 @@ public abstract class FocusCommand extends ActiveRunnable implements Expirable { // This change seems reasonable to me. But as far as some implementations // can ignore the "forced" parameter we can get bad focus behaviour. // So let's start from mac. - if (!myToFocus.requestFocusInWindow() && (isForced() && SystemInfo.isMac)) { - myToFocus.requestFocus(); + if (!(myToFocus.requestFocusInWindow())) { + if (!SystemInfo.isMac || isForced() ) { + myToFocus.requestFocus(); + } } } }