MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

WI-14476 When hovering over variable, Expression Evaluation tooltip disappears before I can click the + icon (move ignore_mouse_tracking constant to EditorImpl)

Browse Source
This commit is contained in:
Svetlana.Zemlyanskay
2013-11-12 17:32:13 +04:00
parent c773e813a0
commit 624729a5e3
5 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/debugger/impl/src/com/intellij/debugger/ui/PositionHighlighter.java
+3 -2
View File
@@ -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() {
platform/editor-ui-api/src/com/intellij/openapi/editor/Editor.java
-1
View File
@@ -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];
/**
platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DaemonListeners.java
+2 -1
View File
@@ -42,6 +42,7 @@ 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.ex.EditorMarkupModel;
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;
@@ -581,7 +582,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 {
platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java
+1
View File
@@ -139,6 +139,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");
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebugSessionImpl.java
+3 -2
View File
@@ -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;
@@ -765,9 +766,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);
}
}