Skip to content

[Win32] Return unrounded value in FontMetrics.getAverageCharacterWidth #2496

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[Win32] Return unrounded value in FontMetrics.getAverageCharacterWidth #2496

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
13 changes: 13 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 @@ -125,6 +125,12 @@ public static float pixelToPoint(float size, int zoom) {
return (size / scaleFactor);
}

public static double pixelToPoint(double size, int zoom) {
if (zoom == 100 || size == SWT.DEFAULT) return size;
double scaleFactor = getScalingFactorD (zoom, 100);
return (size / scaleFactor);
}


/**
* Auto-scale image with ImageData
Expand Down Expand Up @@ -194,6 +200,13 @@ public static float getScalingFactor(int zoom) {
}


public static double getScalingFactorD(int targetZoom, int currentZoom) {
if (targetZoom <= 0) {
targetZoom = deviceZoom;
}
return targetZoom / (double) currentZoom;
}

public static float getScalingFactor(int targetZoom, int currentZoom) {
if (targetZoom <= 0) {
targetZoom = deviceZoom;
Expand Down
2 changes: 1 addition & 1 deletion bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/FontMetrics.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ public int getAscent() {
* @since 3.107
*/
public double getAverageCharacterWidth() {
return getAverageCharWidth();
return DPIUtil.pixelToPoint((double)handle.tmAveCharWidth, getZoom());
}

/**
Expand Down
Loading