IDEA-82558 let editor handle cursor hiding to prevent hiding on shortcuts

This commit is contained in:
Dennis Ushakov
2012-03-12 11:26:10 +04:00
parent c042799952
commit 30b042ed7c
2 changed files with 3 additions and 3 deletions
@@ -81,6 +81,7 @@ import com.intellij.util.containers.HashMap;
import com.intellij.util.messages.MessageBusConnection;
import com.intellij.util.text.CharArrayUtil;
import com.intellij.util.ui.ButtonlessScrollBarUI;
import com.intellij.util.ui.MacUIUtil;
import com.intellij.util.ui.UIUtil;
import com.intellij.util.ui.update.UiNotifyConnector;
import gnu.trove.TIntArrayList;
@@ -877,6 +878,7 @@ public final class EditorImpl extends UserDataHolderBase implements EditorEx, Hi
ActionManagerEx actionManager = ActionManagerEx.getInstanceEx();
DataContext dataContext = getDataContext();
actionManager.fireBeforeEditorTyping(c, dataContext);
MacUIUtil.hideCursor();
EditorActionManager.getInstance().getTypedAction().actionPerformed(this, c, dataContext);
return true;
@@ -35,7 +35,6 @@ import com.intellij.openapi.keymap.impl.ui.ShortcutTextField;
import com.intellij.openapi.project.DumbService;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.ui.DialogWrapper;
import com.intellij.openapi.ui.TypingTarget;
import com.intellij.openapi.ui.popup.JBPopup;
import com.intellij.openapi.ui.popup.ListPopupStep;
import com.intellij.openapi.ui.popup.PopupStep;
@@ -166,8 +165,7 @@ public final class IdeKeyEventDispatcher implements Disposable {
if (focusOwner instanceof ShortcutTextField) {
return false;
}
if ((focusOwner instanceof TypingTarget ||
(focusOwner instanceof JTextComponent && ((JTextComponent)focusOwner).isEditable()))) {
if (focusOwner instanceof JTextComponent && ((JTextComponent)focusOwner).isEditable()) {
if (e.getKeyChar() != KeyEvent.CHAR_UNDEFINED && e.getKeyChar() != KeyEvent.VK_ESCAPE) {
MacUIUtil.hideCursor();
}