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

Lense mode "EAP" preview

Browse Source
This commit is contained in:
Vassiliy Kudryashov
2013-10-01 23:35:21 +04:00
parent 472451524d
commit 340cae7ede
3 changed files with 27 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/ide/IdeTooltipManager.java
+1 -1
View File
@@ -381,7 +381,7 @@ public class IdeTooltipManager implements ApplicationComponent, AWTEventListener
}
public boolean hideCurrent(@Nullable MouseEvent me, @Nullable AnAction action, @Nullable AnActionEvent event) {
return hideCurrent(me, action, event, true);
return hideCurrent(me, action, event, myCurrentTipUi != null && myCurrentTipUi.isAnimationEnabled());
}
public boolean hideCurrent(@Nullable MouseEvent me, @Nullable AnAction action, @Nullable AnActionEvent event, final boolean animationEnabled) {
platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorMarkupModelImpl.java
+22 -22
View File
@@ -42,6 +42,7 @@ import com.intellij.openapi.ui.MessageType;
import com.intellij.openapi.ui.popup.Balloon;
import com.intellij.openapi.util.Disposer;
import com.intellij.openapi.util.ProperTextRange;
import com.intellij.openapi.wm.impl.IdeRootPane;
import com.intellij.ui.*;
import com.intellij.ui.awt.RelativePoint;
import com.intellij.util.Processor;
@@ -156,7 +157,7 @@ public class EditorMarkupModelImpl extends MarkupModelImpl implements EditorMark
boolean isVisible = area.contains(area.x, realY);//area.y < realY && area.y + area.height > realY;
TooltipRenderer bigRenderer;
if (!ApplicationManager.getApplication().isInternal() || isVisible) {
if (!(UIUtil.getRootPane(myEditor.getComponent()) instanceof IdeRootPane) || isVisible) {
final Set<RangeHighlighter> highlighters = new THashSet<RangeHighlighter>();
getNearestHighlighters(this, me.getY(), highlighters);
getNearestHighlighters((MarkupModelEx)DocumentMarkupModel.forDocument(myEditor.getDocument(), getEditor().getProject(), true), me.getY(), highlighters);
@@ -1015,7 +1016,7 @@ public class EditorMarkupModelImpl extends MarkupModelImpl implements EditorMark
}
private class EditorFragmentRenderer implements TooltipRenderer {
private int myLine;
private Collection<RangeHighlighterEx> myHighlighters;
private List<RangeHighlighterEx> myHighlighters = new ArrayList<RangeHighlighterEx>();
private BufferedImage myImage;
private int myStartLine;
private int myEndLine;
@@ -1025,12 +1026,27 @@ public class EditorMarkupModelImpl extends MarkupModelImpl implements EditorMark
update(0, Collections.<RangeHighlighterEx>emptyList());
}
public void update(int currentLine, Collection<RangeHighlighterEx> rangeHighlighters) {
void update(int currentLine, Collection<RangeHighlighterEx> rangeHighlighters) {
myLine = currentLine;
myHighlighters = rangeHighlighters;
myHighlighters.clear();
myImage = null;
myStartLine = Math.max(0, myLine - myPreviewLines);
myEndLine = Math.min(myEditor.getDocument().getLineCount() - 1, myLine + myPreviewLines + 1);
int popupStartOffset = myEditor.getDocument().getLineStartOffset(myStartLine);
int popupEndOffset = myEditor.getDocument().getLineEndOffset(myEndLine);
for (RangeHighlighterEx rangeHighlighter : rangeHighlighters) {
if (rangeHighlighter.getEndOffset()> popupStartOffset && rangeHighlighter.getStartOffset() < popupEndOffset) {
myHighlighters.add(rangeHighlighter);
}
}
Collections.sort(myHighlighters, new Comparator<RangeHighlighterEx>() {
public int compare(RangeHighlighterEx ex1, RangeHighlighterEx ex2) {
LogicalPosition startPos1 = myEditor.offsetToLogicalPosition(ex1.getAffectedAreaStartOffset());
LogicalPosition startPos2 = myEditor.offsetToLogicalPosition(ex2.getAffectedAreaStartOffset());
if (startPos1.line != startPos2.line) return 0;
return startPos1.column - startPos2.column;
}
});
}
@Override
@@ -1069,14 +1085,6 @@ public class EditorMarkupModelImpl extends MarkupModelImpl implements EditorMark
g2d.setColor(myEditor.getBackgroundColor());
g2d.fillRect(0, 0, getWidth(), getHeight());
int lineShift = -myEditor.getLineHeight() * myStartLine;//first fragment line offset
int popupStartOffset = myEditor.getDocument().getLineStartOffset(myStartLine);
int popupEndOffset = myEditor.getDocument().getLineEndOffset(myEndLine);
List<RangeHighlighterEx> exs = new ArrayList<RangeHighlighterEx>();
for (RangeHighlighterEx rangeHighlighter : myHighlighters) {
if (rangeHighlighter.getEndOffset()> popupStartOffset && rangeHighlighter.getStartOffset() < popupEndOffset) {
exs.add(rangeHighlighter);
}
}
AffineTransform translateInstance = AffineTransform.getTranslateInstance(-LEFT_INDENT, lineShift);
translateInstance.preConcatenate(transform);
g2d.setTransform(translateInstance);
@@ -1090,16 +1098,9 @@ public class EditorMarkupModelImpl extends MarkupModelImpl implements EditorMark
translateInstance.preConcatenate(transform);
g2d.setTransform(translateInstance);
contentComponent.paint(g2d);
Collections.sort(exs, new Comparator<RangeHighlighterEx>() {
public int compare(RangeHighlighterEx ex1, RangeHighlighterEx ex2) {
LogicalPosition startPos1 = myEditor.offsetToLogicalPosition(ex1.getAffectedAreaStartOffset());
LogicalPosition startPos2 = myEditor.offsetToLogicalPosition(ex2.getAffectedAreaStartOffset());
if (startPos1.line != startPos2.line) return 0;
return startPos1.column - startPos2.column;
}
});
TIntIntHashMap rightEdges = new TIntIntHashMap();
for (RangeHighlighterEx ex : exs) {
int h = myEditor.getLineHeight() - 2;
for (RangeHighlighterEx ex : myHighlighters) {
//int hStartOffset = ex.getAffectedAreaStartOffset();
int hEndOffset = ex.getAffectedAreaEndOffset();
Object tooltip = ex.getErrorStripeTooltip();
@@ -1117,7 +1118,6 @@ public class EditorMarkupModelImpl extends MarkupModelImpl implements EditorMark
int w = g2d.getFontMetrics().stringWidth(s);
int a = g2d.getFontMetrics().getAscent();
int h = myEditor.getLineHeight();
int rightEdge = rightEdges.get(logicalPosition.line);
placeToShow.x = Math.max(placeToShow.x, rightEdge);
platform/platform-impl/src/com/intellij/ui/BalloonImpl.java
+4
View File
@@ -1541,4 +1541,8 @@ public class BalloonImpl implements Balloon, IdeTooltip.Ui, SwingConstants {
public void setAnimationEnabled(boolean enabled) {
myAnimationEnabled = enabled;
}
public boolean isAnimationEnabled() {
return myAnimationEnabled;
}
}