From 1d64f5d97cf5aab2bcb317745fc1cd134fa7709b Mon Sep 17 00:00:00 2001 From: Dennis Ushakov Date: Wed, 7 Mar 2012 11:54:43 +0400 Subject: [PATCH] moved conditions check to MacUiUtil --- .../intellij/openapi/keymap/impl/IdeKeyEventDispatcher.java | 3 +-- platform/util/src/com/intellij/util/ui/MacUIUtil.java | 5 ++++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/IdeKeyEventDispatcher.java b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/IdeKeyEventDispatcher.java index 28001031f8e4..3ae782c09ebc 100644 --- a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/IdeKeyEventDispatcher.java +++ b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/IdeKeyEventDispatcher.java @@ -166,8 +166,7 @@ public final class IdeKeyEventDispatcher implements Disposable { if (focusOwner instanceof ShortcutTextField) { return false; } - if (Registry.is("ide.mac.hide.cursor.when.typing") && - (focusOwner instanceof TypingTarget || + if ((focusOwner instanceof TypingTarget || (focusOwner instanceof JTextComponent && ((JTextComponent)focusOwner).isEditable()))) { if (e.getKeyChar() != KeyEvent.CHAR_UNDEFINED && e.getKeyChar() != KeyEvent.VK_ESCAPE) { MacUIUtil.hideCursor(); diff --git a/platform/util/src/com/intellij/util/ui/MacUIUtil.java b/platform/util/src/com/intellij/util/ui/MacUIUtil.java index 2048c6dcd9b8..118fbe9850ae 100644 --- a/platform/util/src/com/intellij/util/ui/MacUIUtil.java +++ b/platform/util/src/com/intellij/util/ui/MacUIUtil.java @@ -16,6 +16,7 @@ package com.intellij.util.ui; import com.intellij.openapi.util.SystemInfo; +import com.intellij.openapi.util.registry.Registry; import com.intellij.ui.ColorUtil; import com.intellij.ui.Gray; import com.intellij.ui.mac.foundation.Foundation; @@ -43,7 +44,9 @@ public class MacUIUtil { } public static void hideCursor() { - Foundation.invoke("NSCursor", "setHiddenUntilMouseMoves:", true); + if (SystemInfo.isMac && Registry.is("ide.mac.hide.cursor.when.typing")) { + Foundation.invoke("NSCursor", "setHiddenUntilMouseMoves:", true); + } } public static class EditorTextFieldBorder implements Border {