Skip to content
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

#1596: [Win32] Drawing produces unsymmetric results without swt.autoScale=false for 4k monitor with zooming #1607

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

#1596: [Win32] Drawing produces unsymmetric results without swt.autoScale=false for 4k monitor with zooming #1607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3d2c4d1
DPIUtil: introduce swt.autoScale=halfUp
Nov 19, 2024
bd0b255
#1596: [Win32] Drawing produces unsymmetric results without swt.autoS…
Nov 19, 2024
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
10 changes: 10 additions & 0 deletions bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/DPIUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,6 +400,10 @@ public static int autoScaleUp(Drawable drawable, int size) {
return scaleUp(drawable, size, deviceZoom);
}

public static int scaleUpXY(Drawable drawable, int size, int zoom) {
return scaleUp(drawable, size + 1, zoom) - 1;
}

public static int scaleUp(Drawable drawable, int size, int zoom) {
if (drawable != null && !drawable.isAutoScalable()) return size;
return scaleUp (size, zoom);
Expand All @@ -419,6 +423,10 @@ public static float autoScaleUp(Drawable drawable, float size) {
return scaleUp(drawable, size, deviceZoom);
}

public static float scaleUpXY(Drawable drawable, float size, int zoom) {
return scaleUp(drawable, size + 1, zoom) - 1;
}

public static float scaleUp(Drawable drawable, float size, int zoom) {
if (drawable != null && !drawable.isAutoScalable()) return size;
return scaleUp (size, zoom);
Expand Down Expand Up @@ -630,6 +638,8 @@ public static int getZoomForAutoscaleProperty (int nativeDeviceZoom) {
if (autoScaleValue != null) {
if ("false".equalsIgnoreCase (autoScaleValue)) {
zoom = 100;
} else if ("halfUp".equalsIgnoreCase (autoScaleValue)) {
zoom = (nativeDeviceZoom + 50) / 100 * 100;
} else if ("half".equalsIgnoreCase (autoScaleValue)) {
// Math.round rounds 125->150 and 175->200,
// Math.rint rounds 125->100 and 175->200 matching
Expand Down
43 changes: 23 additions & 20 deletions bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/GC.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1644,10 +1644,10 @@ void drawBitmapColor(Image srcImage, int srcX, int srcY, int srcWidth, int srcHe
*/
public void drawLine (int x1, int y1, int x2, int y2) {
int deviceZoom = getZoom();
x1 = DPIUtil.scaleUp (drawable, x1, deviceZoom);
x2 = DPIUtil.scaleUp (drawable, x2, deviceZoom);
y1 = DPIUtil.scaleUp (drawable, y1, deviceZoom);
y2 = DPIUtil.scaleUp (drawable, y2, deviceZoom);
x1 = scaleUpXY (x1, deviceZoom);
x2 = scaleUpXY (x2, deviceZoom);
y1 = scaleUpXY (y1, deviceZoom);
y2 = scaleUpXY (y2, deviceZoom);
drawLineInPixels(x1, y1, x2, y2);
}

Expand Down Expand Up @@ -1911,8 +1911,8 @@ void drawPolylineInPixels(int[] pointArray) {
*/
public void drawRectangle (int x, int y, int width, int height) {
int deviceZoom = getZoom();
x = DPIUtil.scaleUp (drawable, x, deviceZoom);
y = DPIUtil.scaleUp (drawable, y, deviceZoom);
x = scaleUpXY (x, deviceZoom);
y = scaleUpXY (y, deviceZoom);
width = DPIUtil.scaleUp (drawable, width, deviceZoom);
height = DPIUtil.scaleUp (drawable, height, deviceZoom);
drawRectangleInPixels(x, y, width, height);
Expand Down Expand Up @@ -1997,8 +1997,8 @@ public void drawRectangle (Rectangle rect) {
*/
public void drawRoundRectangle (int x, int y, int width, int height, int arcWidth, int arcHeight) {
int deviceZoom = getZoom();
x = DPIUtil.scaleUp (drawable, x, deviceZoom);
y = DPIUtil.scaleUp (drawable, y, deviceZoom);
x = scaleUpXY (x, deviceZoom);
y = scaleUpXY (y, deviceZoom);
width = DPIUtil.scaleUp (drawable, width, deviceZoom);
height = DPIUtil.scaleUp (drawable, height, deviceZoom);
arcWidth = DPIUtil.scaleUp (drawable, arcWidth, deviceZoom);
Expand Down Expand Up @@ -2095,8 +2095,8 @@ void drawRoundRectangleGdip (long gdipGraphics, long pen, int x, int y, int widt
*/
public void drawString (String string, int x, int y) {
int deviceZoom = getZoom();
x = DPIUtil.scaleUp(drawable, x, deviceZoom);
y = DPIUtil.scaleUp(drawable, y, deviceZoom);
x = scaleUpXY(x, deviceZoom);
y = scaleUpXY(y, deviceZoom);
drawStringInPixels(string, x, y, false);
}

Expand Down Expand Up @@ -2129,8 +2129,8 @@ public void drawString (String string, int x, int y) {
*/
public void drawString (String string, int x, int y, boolean isTransparent) {
int deviceZoom = getZoom();
x = DPIUtil.scaleUp(drawable, x, deviceZoom);
y = DPIUtil.scaleUp(drawable, y, deviceZoom);
x = scaleUpXY(x, deviceZoom);
y = scaleUpXY(y, deviceZoom);
drawStringInPixels(string, x, y, isTransparent);
}

Expand Down Expand Up @@ -2221,8 +2221,8 @@ void drawStringInPixels (String string, int x, int y, boolean isTransparent) {
*/
public void drawText (String string, int x, int y) {
int deviceZoom = getZoom();
x = DPIUtil.scaleUp(drawable, x, deviceZoom);
y = DPIUtil.scaleUp(drawable, y, deviceZoom);
x = scaleUpXY(x, deviceZoom);
y = scaleUpXY(y, deviceZoom);
drawTextInPixels(string, x, y);
}

Expand Down Expand Up @@ -2256,8 +2256,8 @@ void drawTextInPixels (String string, int x, int y) {
*/
public void drawText (String string, int x, int y, boolean isTransparent) {
int deviceZoom = getZoom();
x = DPIUtil.scaleUp(drawable, x, deviceZoom);
y = DPIUtil.scaleUp(drawable, y, deviceZoom);
x = scaleUpXY(x, deviceZoom);
y = scaleUpXY(y, deviceZoom);
drawTextInPixels(string, x, y, isTransparent);
}

Expand Down Expand Up @@ -2308,8 +2308,8 @@ void drawTextInPixels (String string, int x, int y, boolean isTransparent) {
*/
public void drawText (String string, int x, int y, int flags) {
int deviceZoom = getZoom();
x = DPIUtil.scaleUp(drawable, x, deviceZoom);
y = DPIUtil.scaleUp(drawable, y, deviceZoom);
x = scaleUpXY(x, deviceZoom);
y = scaleUpXY(y, deviceZoom);
drawTextInPixels(string, x, y, flags);
}

Expand Down Expand Up @@ -2688,8 +2688,8 @@ public boolean equals (Object object) {
*/
public void fillArc (int x, int y, int width, int height, int startAngle, int arcAngle) {
int deviceZoom = getZoom();
x = DPIUtil.scaleUp (drawable, x, deviceZoom);
y = DPIUtil.scaleUp (drawable, y, deviceZoom);
x = scaleUpXY (x, deviceZoom);
y = scaleUpXY (y, deviceZoom);
width = DPIUtil.scaleUp (drawable, width, deviceZoom);
height = DPIUtil.scaleUp (drawable, height, deviceZoom);
fillArcInPixels(x, y, width, height, startAngle, arcAngle);
Expand Down Expand Up @@ -5163,4 +5163,7 @@ private int getZoom() {
return DPIUtil.getZoomForAutoscaleProperty(data.nativeZoom);
}

private int scaleUpXY(int xy, int deviceZoom) {
return DPIUtil.scaleUpXY (drawable, xy, deviceZoom);
}
}
39 changes: 21 additions & 18 deletions bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Path.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,8 +209,8 @@ private Path(Device device, PathData data, int zoom) {
public void addArc (float x, float y, float width, float height, float startAngle, float arcAngle) {
if (width == 0 || height == 0 || arcAngle == 0) return;
Drawable drawable = getDevice();
x = DPIUtil.scaleUp(drawable, x, initialZoom);
y = DPIUtil.scaleUp(drawable, y, initialZoom);
x = scaleUpXY(drawable, x);
y = scaleUpXY(drawable, y);
width = DPIUtil.scaleUp(drawable, width, initialZoom);
height = DPIUtil.scaleUp(drawable, height, initialZoom);
addArcInPixels(x, y, width, height, startAngle, arcAngle);
Expand Down Expand Up @@ -312,8 +312,8 @@ void addRectangleInPixels(float x, float y, float width, float height) {
*/
public void addString (String string, float x, float y, Font font) {
Drawable drawable = getDevice();
x = DPIUtil.scaleUp(drawable, x, initialZoom);
y = DPIUtil.scaleUp(drawable, y, initialZoom);
x = scaleUpXY(drawable, x);
y = scaleUpXY(drawable, y);
addStringInPixels(string, x, y, font);
}
void addStringInPixels(String string, float x, float y, Font font) {
Expand Down Expand Up @@ -384,8 +384,8 @@ public void close() {
*/
public boolean contains (float x, float y, GC gc, boolean outline) {
Drawable drawable = getDevice();
x = DPIUtil.scaleUp(drawable, x, initialZoom);
y = DPIUtil.scaleUp(drawable, y, initialZoom);
x = scaleUpXY(drawable, x);
y = scaleUpXY(drawable, y);
return containsInPixels(x, y, gc, outline);
}
boolean containsInPixels(float x, float y, GC gc, boolean outline) {
Expand Down Expand Up @@ -420,12 +420,12 @@ boolean containsInPixels(float x, float y, GC gc, boolean outline) {
*/
public void cubicTo (float cx1, float cy1, float cx2, float cy2, float x, float y) {
Drawable drawable = getDevice();
cx1 = DPIUtil.scaleUp(drawable, cx1, initialZoom);
cy1 = DPIUtil.scaleUp(drawable, cy1, initialZoom);
cx2 = DPIUtil.scaleUp(drawable, cx2, initialZoom);
cy2 = DPIUtil.scaleUp(drawable, cy2, initialZoom);
x = DPIUtil.scaleUp(drawable, x, initialZoom);
y = DPIUtil.scaleUp(drawable, y, initialZoom);
cx1 = scaleUpXY(drawable, cx1);
cy1 = scaleUpXY(drawable, cy1);
cx2 = scaleUpXY(drawable, cx2);
cy2 = scaleUpXY(drawable, cy2);
x = scaleUpXY(drawable, x);
y = scaleUpXY(drawable, y);
cubicToInPixels(cx1, cy1, cx2, cy2, x, y);
}

Expand Down Expand Up @@ -591,7 +591,7 @@ PathData getPathDataInPixels() {
*/
public void lineTo (float x, float y) {
Drawable drawable = getDevice();
lineToInPixels(DPIUtil.scaleUp(drawable, x, initialZoom), DPIUtil.scaleUp(drawable, y, initialZoom));
lineToInPixels(scaleUpXY(drawable, x), scaleUpXY(drawable, y));
}

void lineToInPixels(float x, float y) {
Expand Down Expand Up @@ -656,7 +656,7 @@ public boolean isDisposed() {
*/
public void moveTo (float x, float y) {
Drawable drawable = getDevice();
moveToInPixels(DPIUtil.scaleUp(drawable, x, initialZoom), DPIUtil.scaleUp(drawable, y, initialZoom));
moveToInPixels(scaleUpXY(drawable, x), scaleUpXY(drawable, y));
}

void moveToInPixels(float x, float y) {
Expand All @@ -680,10 +680,10 @@ void moveToInPixels(float x, float y) {
*/
public void quadTo (float cx, float cy, float x, float y) {
Drawable drawable = getDevice();
cx = DPIUtil.scaleUp(drawable, cx, initialZoom);
cy = DPIUtil.scaleUp(drawable, cy, initialZoom);
x = DPIUtil.scaleUp(drawable, x, initialZoom);
y = DPIUtil.scaleUp(drawable, y, initialZoom);
cx = scaleUpXY(drawable, cx);
cy = scaleUpXY(drawable, cy);
x = scaleUpXY(drawable, x);
y = scaleUpXY(drawable, y);
quadToInPixels(cx, cy, x, y);
}

Expand Down Expand Up @@ -718,4 +718,7 @@ long getHandle(int zoom) {
return zoomLevelToHandle.get(zoom);
}

private float scaleUpXY(Drawable drawable, float xy) {
return DPIUtil.scaleUpXY(drawable, xy, initialZoom);
}
}
Loading