Skip to content

Temporary workaround for LineNumberRulerColumn regression on Linux #2742

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 22, 2025
Merged

Temporary workaround for LineNumberRulerColumn regression on Linux #2742

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 15 additions & 12 deletions bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/source/LineNumberRulerColumn.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Display;

import org.eclipse.core.runtime.Platform.OS;

import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.IRegion;
Expand Down Expand Up @@ -687,24 +689,25 @@ private void doubleBufferPaint(GC dest) {
}

if (fBuffer == null) {
fBuffer= newFullBufferImage(size);
newFullBufferImage(visibleLines, size);
} else {
doPaint(visibleLines, size);
}
dest.drawImage(fBuffer, 0, 0);
}

private Image newFullBufferImage(Point size) {
ImageGcDrawer imageGcDrawer= (gc, imageWidth, imageHeight) -> {
ILineRange lines= JFaceTextUtil.getVisibleModelLines(fCachedTextViewer);
if (lines == null) {
return;
}
// We redraw everything; paint directly into the buffer
initializeGC(gc, 0, 0, imageWidth, imageHeight);
doPaint(gc, lines);
};
return new Image(fCanvas.getDisplay(), imageGcDrawer, size.x, size.y);
private void newFullBufferImage(ILineRange visibleLines, Point size) {
if (OS.isLinux()) {
fBuffer= new Image(fCanvas.getDisplay(), size.x, size.y);
doPaint(visibleLines, size);
} else {
ImageGcDrawer imageGcDrawer= (gc, imageWidth, imageHeight) -> {
// We redraw everything; paint directly into the buffer
initializeGC(gc, 0, 0, imageWidth, imageHeight);
doPaint(gc, visibleLines);
};
fBuffer= new Image(fCanvas.getDisplay(), imageGcDrawer, size.x, size.y);
}
}

private void doPaint(ILineRange visibleLines, Point size) {
Expand Down
Loading