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

IDEA-98074 Line spacing makes cursor oversized

Browse Source
This commit is contained in:
Dmitry Batrak
2016-09-20 15:30:47 +03:00
parent 79b1c6ff93
commit e67053b281
3 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorComponentImpl.java
+2 -2
View File
@@ -251,8 +251,8 @@ public class EditorComponentImpl extends JTextComponent implements Scrollable, D
}
public void repaintEditorComponent(int x, int y, int width, int height) {
int topOverhang = myEditor.myView.getTopOverhang();
int bottomOverhang = myEditor.myView.getBottomOverhang();
int topOverhang = Math.max(0, myEditor.myView.getTopOverhang());
int bottomOverhang = Math.max(0, myEditor.myView.getBottomOverhang());
repaint(x, y - topOverhang, width, height + topOverhang + bottomOverhang);
}
platform/platform-impl/src/com/intellij/openapi/editor/impl/view/EditorPainter.java
+10 -8
View File
@@ -795,7 +795,8 @@ class EditorPainter implements TextDrawingCallback {
if (locations == null) return;
Graphics2D g = IdeBackgroundUtil.getOriginalGraphics(g_);
int lineHeight = myView.getLineHeight();
int nominalLineHeight = myView.getNominalLineHeight();
int topOverhang = myView.getTopOverhang();
EditorSettings settings = myEditor.getSettings();
Color caretColor = myEditor.getColorsScheme().getColor(EditorColors.CARET_COLOR);
if (caretColor == null) caretColor = new JBColor(CARET_DARK, CARET_LIGHT);
@@ -803,7 +804,7 @@ class EditorPainter implements TextDrawingCallback {
for (EditorImpl.CaretRectangle location : locations) {
g.setColor(caretColor);
int x = location.myPoint.x;
int y = location.myPoint.y;
int y = location.myPoint.y - topOverhang;
Caret caret = location.myCaret;
boolean isRtl = location.myIsRtl;
if (myEditor.isInsertMode() != settings.isBlockCursor()) {
@@ -812,7 +813,7 @@ class EditorPainter implements TextDrawingCallback {
if (!ImmediatePainter.isZeroLatencyTypingEnabled()) {
if (x > minX && lineWidth > 1) x--; // fully cover extra character's pixel which can appear due to antialiasing
}
g.fillRect(x, y, lineWidth, lineHeight);
g.fillRect(x, y, lineWidth, nominalLineHeight);
if (myDocument.getTextLength() > 0 && caret != null &&
!myView.getTextLayoutCache().getLineLayout(caret.getLogicalPosition().line).isLtr()) {
g.fillPolygon(new int[]{
@@ -826,7 +827,7 @@ class EditorPainter implements TextDrawingCallback {
else {
int width = location.myWidth;
int startX = Math.max(minX, isRtl ? x - width : x);
g.fillRect(startX, y, width, lineHeight - 1);
g.fillRect(startX, y, width, nominalLineHeight - 1);
if (myDocument.getTextLength() > 0 && caret != null) {
int targetVisualColumn = caret.getVisualPosition().column;
for (VisualLineFragmentsIterator.Fragment fragment : VisualLineFragmentsIterator.create(myView,
@@ -839,7 +840,7 @@ class EditorPainter implements TextDrawingCallback {
startVisualColumn == targetVisualColumn && !isRtl ||
endVisualColumn == targetVisualColumn && isRtl) {
g.setColor(ColorUtil.isDark(caretColor) ? CARET_LIGHT : CARET_DARK);
fragment.draw(g, startX, y + myView.getAscent(),
fragment.draw(g, startX, y + topOverhang + myView.getAscent(),
targetVisualColumn - startVisualColumn - (isRtl ? 1 : 0),
targetVisualColumn - startVisualColumn + (isRtl ? 0 : 1));
break;
@@ -854,12 +855,13 @@ class EditorPainter implements TextDrawingCallback {
void repaintCarets() {
EditorImpl.CaretRectangle[] locations = myEditor.getCaretLocations(false);
if (locations == null) return;
int lineHeight = myView.getLineHeight();
int nominalLineHeight = myView.getNominalLineHeight();
int topOverhang = myView.getTopOverhang();
for (EditorImpl.CaretRectangle location : locations) {
int x = location.myPoint.x;
int y = location.myPoint.y;
int y = location.myPoint.y - topOverhang;
int width = Math.max(location.myWidth, CARET_DIRECTION_MARK_SIZE);
myEditor.getContentComponent().repaintEditorComponent(x - width, y, width * 2, lineHeight);
myEditor.getContentComponent().repaintEditorComponent(x - width, y, width * 2, nominalLineHeight);
}
}
platform/platform-impl/src/com/intellij/openapi/editor/impl/view/EditorView.java
+9 -2
View File
@@ -383,6 +383,13 @@ public class EditorView implements TextDrawingCallback, Disposable, Dumpable {
}
}
public int getNominalLineHeight() {
synchronized (myLock) {
initMetricsIfNeeded();
return myLineHeight + myTopOverhang + myBottomOverhang;
}
}
public int getLineHeight() {
synchronized (myLock) {
initMetricsIfNeeded();
@@ -455,8 +462,8 @@ public class EditorView implements TextDrawingCallback, Disposable, Dumpable {
int ascent = FontLayoutService.getInstance().getAscent(fm);
myAscent = (int)Math.ceil(ascent * verticalScalingFactor);
myTopOverhang = Math.max(ascent - myAscent, 0);
myBottomOverhang = Math.max(fontMetricsHeight - ascent - myLineHeight + myAscent, 0);
myTopOverhang = ascent - myAscent;
myBottomOverhang = fontMetricsHeight - ascent - myLineHeight + myAscent;
// assuming that bold italic 'W' gives a good approximation of font's widest character
FontMetrics fmBI = myEditor.getContentComponent().getFontMetrics(myEditor.getColorsScheme().getFont(EditorFontType.BOLD_ITALIC));