Commit 1ded7fa2 authored by Svetlana.Zemlyanskay's avatar Svetlana.Zemlyanskay
Browse files

WI-14476 When hovering over variable, Expression Evaluation tooltip disappears...

WI-14476 When hovering over variable, Expression Evaluation tooltip disappears before I can click the + icon (move ignore_mouse_tracking constant to EditorImpl)
parent cc585416
Showing with 9 additions and 6 deletions
+9 -6
......@@ -36,6 +36,7 @@ import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.editor.colors.EditorColorsManager;
import com.intellij.openapi.editor.colors.EditorColorsScheme;
import com.intellij.openapi.editor.ex.DocumentEx;
import com.intellij.openapi.editor.impl.EditorImpl;
import com.intellij.openapi.editor.markup.GutterIconRenderer;
import com.intellij.openapi.editor.markup.RangeHighlighter;
import com.intellij.openapi.project.Project;
......@@ -130,9 +131,9 @@ public class PositionHighlighter {
private static void adjustCounter(@NotNull Editor editor, int increment) {
JComponent component = editor.getComponent();
Object o = component.getClientProperty(Editor.IGNORE_MOUSE_TRACKING);
Object o = component.getClientProperty(EditorImpl.IGNORE_MOUSE_TRACKING);
Integer value = ((o instanceof Integer) ? (Integer)o : 0) + increment;
component.putClientProperty(Editor.IGNORE_MOUSE_TRACKING, value > 0 ? value : null);
component.putClientProperty(EditorImpl.IGNORE_MOUSE_TRACKING, value > 0 ? value : null);
}
public void remove() {
......
......@@ -40,6 +40,7 @@ import com.intellij.openapi.editor.colors.EditorColorsManager;
import com.intellij.openapi.editor.colors.EditorColorsScheme;
import com.intellij.openapi.editor.event.*;
import com.intellij.openapi.editor.ex.EditorEventMulticasterEx;
import com.intellij.openapi.editor.impl.EditorImpl;
import com.intellij.openapi.fileEditor.FileDocumentManager;
import com.intellij.openapi.fileEditor.FileEditor;
import com.intellij.openapi.fileEditor.FileEditorManager;
......@@ -564,7 +565,7 @@ public class DaemonListeners implements Disposable {
public void mouseMoved(EditorMouseEvent e) {
Editor editor = e.getEditor();
if (myProject != editor.getProject()) return;
if (editor.getComponent().getClientProperty(Editor.IGNORE_MOUSE_TRACKING) != null) return;
if (editor.getComponent().getClientProperty(EditorImpl.IGNORE_MOUSE_TRACKING) != null) return;
boolean shown = false;
try {
......
......@@ -38,7 +38,6 @@ import java.awt.event.MouseEvent;
* @see EditorFactory#createViewer(Document)
*/
public interface Editor extends UserDataHolder {
@NonNls Object IGNORE_MOUSE_TRACKING = "ignore_mouse_tracking";
Editor[] EMPTY_ARRAY = new Editor[0];
/**
......
......@@ -138,6 +138,7 @@ public final class EditorImpl extends UserDataHolderBase implements EditorEx, Hi
private static final int MIN_FONT_SIZE = 8;
private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.editor.impl.EditorImpl");
private static final Key DND_COMMAND_KEY = Key.create("DndCommand");
@NonNls public static final Object IGNORE_MOUSE_TRACKING = "ignore_mouse_tracking";
public static final Key<JComponent> PERMANENT_HEADER = Key.create("PERMANENT_HEADER");
public static final Key<Boolean> DO_DOCUMENT_UPDATE_TEST = Key.create("DoDocumentUpdateTest");
public static final Key<Pair<String, String>> EDITABLE_AREA_MARKER = Key.create("editable.area.marker");
......
......@@ -39,6 +39,7 @@ import com.intellij.openapi.application.ReadAction;
import com.intellij.openapi.application.Result;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.editor.impl.EditorImpl;
import com.intellij.openapi.editor.markup.GutterIconRenderer;
import com.intellij.openapi.fileEditor.FileEditorManager;
import com.intellij.openapi.fileEditor.OpenFileDescriptor;
......@@ -773,9 +774,9 @@ public class XDebugSessionImpl implements XDebugSession {
final Editor editor = getEditor(position);
if (editor != null) {
JComponent component = editor.getComponent();
Object o = component.getClientProperty(Editor.IGNORE_MOUSE_TRACKING);
Object o = component.getClientProperty(EditorImpl.IGNORE_MOUSE_TRACKING);
Integer value = ((o instanceof Integer) ? (Integer)o : 0) + increment;
component.putClientProperty(Editor.IGNORE_MOUSE_TRACKING, value > 0 ? value : null);
component.putClientProperty(EditorImpl.IGNORE_MOUSE_TRACKING, value > 0 ? value : null);
}
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment