Skip to content

[POC] When computing the size of a widget always return values rounded up #2502

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

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
+34 −8
Draft

[POC] When computing the size of a widget always return values rounded up #2502

Show file tree
Hide file tree
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
5 changes: 3 additions & 2 deletions bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/Point.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

import java.io.*;

import org.eclipse.swt.internal.*;
import org.eclipse.swt.widgets.*;

/**
Expand Down Expand Up @@ -135,8 +136,8 @@ public OfFloat(int x, int y) {
super(x, y);
}

public OfFloat(float x, float y) {
super(Math.round(x), Math.round(y));
public OfFloat(float x, float y, RoundingMode mode) {
super(mode.round(x), mode.round(y));
this.residualX = x - this.x;
this.residualY = y - this.y;
}
Expand Down
17 changes: 17 additions & 0 deletions bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/RoundingMode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
package org.eclipse.swt.internal;
/**
* @noreference This class is not intended to be referenced by clients
*/
public enum RoundingMode {
ROUND, UP;

int round(float x) {
if (this == ROUND) {
return Math.round(x);
}
if (this == UP) {
return (int) Math.ceil(x);
}
return (int) x;
}
}
9 changes: 7 additions & 2 deletions bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/Win32DPIUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,12 +114,17 @@ public static float pixelToPoint(Drawable drawable, float size, int zoom) {
}

public static Point pixelToPoint(Point point, int zoom) {
//TODO actually all callers should explicitly state what mode the want!
return pixelToPoint(point, zoom, RoundingMode.ROUND);
}

public static Point pixelToPoint(Point point, int zoom, RoundingMode mode) {
if (zoom == 100 || point == null) return point;
Point.OfFloat fPoint = FloatAwareGeometryFactory.createFrom(point);
float scaleFactor = DPIUtil.getScalingFactor(zoom);
float scaledX = fPoint.getX() / scaleFactor;
float scaledY = fPoint.getY() / scaleFactor;
return new Point.OfFloat(scaledX, scaledY);
return new Point.OfFloat(scaledX, scaledY, mode);
}

public static Point pixelToPoint(Drawable drawable, Point point, int zoom) {
Expand Down Expand Up @@ -225,7 +230,7 @@ public static Point pointToPixel(Point point, int zoom) {
float scaleFactor = DPIUtil.getScalingFactor(zoom);
float scaledX = fPoint.getX() * scaleFactor;
float scaledY = fPoint.getY() * scaleFactor;
return new Point.OfFloat(scaledX, scaledY);
return new Point.OfFloat(scaledX, scaledY, RoundingMode.ROUND);
}

public static Point pointToPixel(Drawable drawable, Point point, int zoom) {
Expand Down
11 changes: 7 additions & 4 deletions bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Control.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -620,7 +620,9 @@ public Point computeSize (int wHint, int hHint, boolean changed){
int zoom = getZoom();
wHint = (wHint != SWT.DEFAULT ? Win32DPIUtils.pointToPixel(wHint, zoom) : wHint);
hHint = (hHint != SWT.DEFAULT ? Win32DPIUtils.pointToPixel(hHint, zoom) : hHint);
return Win32DPIUtils.pixelToPoint(computeSizeInPixels(wHint, hHint, changed), zoom);
//We should never return a size that is to small, RoundingMode.UP ensures we at worst case report
//a size that is a bit too large by half a point
return Win32DPIUtils.pixelToPoint(computeSizeInPixels(wHint, hHint, changed), zoom, RoundingMode.UP);
}

Point computeSizeInPixels (int wHint, int hHint, boolean changed) {
Expand Down Expand Up @@ -1372,7 +1374,8 @@ public Object getLayoutData () {
*/
public Point getLocation () {
checkWidget ();
return Win32DPIUtils.pixelToPoint(getLocationInPixels(), getZoom());
//For a location the closest point values is okay
return Win32DPIUtils.pixelToPoint(getLocationInPixels(), getZoom(), RoundingMode.ROUND);
}

Point getLocationInPixels () {
Expand Down Expand Up @@ -1528,7 +1531,7 @@ public Shell getShell () {
*/
public Point getSize (){
checkWidget ();
return Win32DPIUtils.pixelToPoint(getSizeInPixels (), getZoom());
return Win32DPIUtils.pixelToPoint(getSizeInPixels (), getZoom(), RoundingMode.UP);
}

Point getSizeInPixels () {
Expand Down Expand Up @@ -4030,7 +4033,7 @@ public Point toControl (int x, int y) {
checkWidget ();
Point displayPointInPixels = getDisplay().translateToDisplayCoordinates(new Point(x, y));
final Point controlPointInPixels = toControlInPixels(displayPointInPixels.x, displayPointInPixels.y);
return Win32DPIUtils.pixelToPoint(controlPointInPixels, getZoom());
return Win32DPIUtils.pixelToPoint(controlPointInPixels, getZoom(), RoundingMode.ROUND);
}

Point toControlInPixels (int x, int y) {
Expand Down
Loading