azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed focus requesting in signature balloon

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-09-05 21:40:07 +04:00
parent 502aa1141f
commit ea208965d5
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/codeInsight/ktSignature/EditSignatureBalloon.java
+10 -4
View File
@@ -18,6 +18,7 @@ package org.jetbrains.jet.plugin.codeInsight.ktSignature;
import com.intellij.codeInsight.ExternalAnnotationsManager; import com.intellij.codeInsight.ExternalAnnotationsManager;
import com.intellij.openapi.Disposable; import com.intellij.openapi.Disposable;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.Result; import com.intellij.openapi.application.Result;
import com.intellij.openapi.command.WriteCommandAction; import com.intellij.openapi.command.WriteCommandAction;
import com.intellij.openapi.editor.*; import com.intellij.openapi.editor.*;
@@ -144,9 +145,9 @@ class EditSignatureBalloon implements Disposable {
return editor.logicalPositionToXY(logicalPosition).y; return editor.logicalPositionToXY(logicalPosition).y;
} }
public void show(@Nullable Point point, @NotNull Editor editor, @NotNull PsiElement psiElementInEditor) { public void show(@Nullable Point point, @NotNull final Editor mainEditor, @NotNull PsiElement psiElementInEditor) {
int lineY = getLineY(editor, psiElementInEditor); int lineY = getLineY(mainEditor, psiElementInEditor);
EditorGutterComponentEx gutter = (EditorGutterComponentEx) editor.getGutter(); EditorGutterComponentEx gutter = (EditorGutterComponentEx) mainEditor.getGutter();
Point adjustedPoint; Point adjustedPoint;
if (point == null) { if (point == null) {
adjustedPoint = new Point(gutter.getIconsAreaWidth() + gutter.getLineMarkerAreaOffset(), lineY); adjustedPoint = new Point(gutter.getIconsAreaWidth() + gutter.getLineMarkerAreaOffset(), lineY);
@@ -155,7 +156,12 @@ class EditSignatureBalloon implements Disposable {
adjustedPoint = new Point(point.x, Math.min(lineY, point.y)); adjustedPoint = new Point(point.x, Math.min(lineY, point.y));
} }
balloon.show(new RelativePoint(gutter, adjustedPoint), Balloon.Position.above); balloon.show(new RelativePoint(gutter, adjustedPoint), Balloon.Position.above);
IdeFocusManager.getInstance(editor.getProject()).requestFocus(editor.getContentComponent(), false); ApplicationManager.getApplication().invokeLater(new Runnable() {
@Override
public void run() {
IdeFocusManager.getInstance(mainEditor.getProject()).requestFocus(editor.getContentComponent(), false);
}
});
} }
@Override @Override