Skip to content

Artifacts due to rounding errors in StyledText #2076

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 2 commits into from
May 5, 2025
Merged

Artifacts due to rounding errors in StyledText #2076

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ccfd4f
Artifacts due to rounding errors in StyledText
ShahzaibIbrahim Apr 29, 2025
fc13d0e
Fix for normal monitor
ShahzaibIbrahim May 5, 2025
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
29 changes: 16 additions & 13 deletions bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/TextLayout.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -705,7 +705,7 @@ long createGdipBrush(Color color, int alpha) {
*/
public void draw (GC gc, int x, int y) {
checkLayout();
drawInPixels(gc, DPIUtil.scaleUp(getDevice(), x, getZoom(gc)), DPIUtil.scaleUp(getDevice(), y, getZoom(gc)));
drawInPixels(gc, x, y);
}

/**
Expand All @@ -729,11 +729,11 @@ public void draw (GC gc, int x, int y) {
*/
public void draw (GC gc, int x, int y, int selectionStart, int selectionEnd, Color selectionForeground, Color selectionBackground) {
checkLayout();
drawInPixels(gc, DPIUtil.scaleUp(getDevice(), x, getZoom(gc)), DPIUtil.scaleUp(getDevice(), y, getZoom(gc)), selectionStart, selectionEnd, selectionForeground, selectionBackground);
drawInPixels(gc, x, y, selectionStart, selectionEnd, selectionForeground, selectionBackground);
}

void drawInPixels (GC gc, int x, int y, int selectionStart, int selectionEnd, Color selectionForeground, Color selectionBackground) {
drawInPixels(gc, x, y, selectionStart, selectionEnd, selectionForeground, selectionBackground, 0);
void drawInPixels (GC gc, int xInPoints, int yInPoints, int selectionStart, int selectionEnd, Color selectionForeground, Color selectionBackground) {
drawInPixels(gc, xInPoints, yInPoints, selectionStart, selectionEnd, selectionForeground, selectionBackground, 0);
}

/**
Expand Down Expand Up @@ -765,7 +765,7 @@ void drawInPixels (GC gc, int x, int y, int selectionStart, int selectionEnd, Co
*/
public void draw (GC gc, int x, int y, int selectionStart, int selectionEnd, Color selectionForeground, Color selectionBackground, int flags) {
checkLayout();
drawInPixels(gc, DPIUtil.scaleUp(getDevice(), x, getZoom(gc)), DPIUtil.scaleUp(getDevice(), y, getZoom(gc)), selectionStart, selectionEnd, selectionForeground, selectionBackground, flags);
drawInPixels(gc, x, y, selectionStart, selectionEnd, selectionForeground, selectionBackground, flags);
}

private int getNativeZoom(GC gc) {
Expand All @@ -783,19 +783,19 @@ private int getZoom() {
return DPIUtil.getZoomForAutoscaleProperty(nativeZoom);
}

void drawInPixels (GC gc, int x, int y) {
drawInPixels(gc, x, y, -1, -1, null, null);
void drawInPixels (GC gc, int xInPoints, int yInPoints) {
drawInPixels(gc, xInPoints, yInPoints, -1, -1, null, null);
}

void drawInPixels (GC gc, int x, int y, int selectionStart, int selectionEnd, Color selectionForeground, Color selectionBackground, int flags) {
void drawInPixels (GC gc, int xInPoints, int yInPoints, int selectionStart, int selectionEnd, Color selectionForeground, Color selectionBackground, int flags) {
computeRuns(gc);
if (gc == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
if (gc.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
if (selectionForeground != null && selectionForeground.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
if (selectionBackground != null && selectionBackground.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
int length = text.length();
if (length == 0 && flags == 0) return;
y += getScaledVerticalIndent();
yInPoints += verticalIndentInPoints;
long hdc = gc.handle;
Rectangle clip = gc.getClippingInPixels();
GCData data = gc.data;
Expand Down Expand Up @@ -835,14 +835,17 @@ void drawInPixels (GC gc, int x, int y, int selectionStart, int selectionEnd, Co
selectionEnd = translateOffset(Math.min(Math.max(0, selectionEnd), length - 1));
}
}
int x = DPIUtil.scaleUp(getDevice(), xInPoints, getZoom(gc));
RECT rect = new RECT();
OS.SetBkMode(hdc, OS.TRANSPARENT);
for (int line=0; line<runs.length; line++) {
int drawX = x + getLineIndentInPixel(line);
int drawY = y + DPIUtil.scaleUp(getDevice(), lineY[line], getZoom(gc));
int drawY = DPIUtil.scaleUp(getDevice(), yInPoints + lineY[line], getZoom(gc));
StyleItem[] lineRuns = runs[line];
int drawYWithLineHeight = DPIUtil.scaleUp(getDevice(), yInPoints + lineY[line+1] - lineSpacingInPoints, getZoom(gc));
int drawYWithLineHeightWithSpacing = DPIUtil.scaleUp(getDevice(), yInPoints + lineY[line+1], getZoom(gc));
int lineHeight = DPIUtil.scaleUp(getDevice(), lineY[line+1] - lineY[line] - lineSpacingInPoints, getZoom(gc));
int lineHeightWithSpacing = DPIUtil.scaleUp(getDevice(), lineY[line+1] - lineY[line], getZoom(gc));
int lineHeightWithSpacing = drawYWithLineHeightWithSpacing - drawY;
//Draw last line selection
boolean extents = false;
if ((flags & (SWT.FULL_SELECTION | SWT.DELIMITER_SELECTION)) != 0 && (hasSelection || (flags & SWT.LAST_LINE_SELECTION) != 0)) {
Expand Down Expand Up @@ -885,9 +888,9 @@ void drawInPixels (GC gc, int x, int y, int selectionStart, int selectionEnd, Co
if (drawX + run.width >= clip.x) {
if (!run.lineBreak || run.softBreak) {
if (extents) {
OS.SetRect(rect, drawX, drawY, drawX + run.width, drawY + lineHeightWithSpacing);
OS.SetRect(rect, drawX, drawY, drawX + run.width, drawYWithLineHeightWithSpacing);
}else {
OS.SetRect(rect, drawX, drawY, drawX + run.width, drawY + lineHeight);
OS.SetRect(rect, drawX, drawY, drawX + run.width, drawYWithLineHeight);
}
if (gdip) {
drawRunBackgroundGDIP(run, gdipGraphics, rect, selectionStart, selectionEnd, alpha, gdipSelBackground, hasSelection);
Expand Down
Loading