Skip to content

[win32] Make Font#extractZoom device independent #1943

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
Mar 27, 2025
Merged

[win32] Make Font#extractZoom device independent #1943

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
19 changes: 6 additions & 13 deletions bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Font.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public final class Font extends Resource {
*/
Font(Device device) {
super(device);
this.zoom = extractZoom(this.device);
this.zoom = DPIUtil.getNativeDeviceZoom();
this.fontHeight = 0;
}

Expand Down Expand Up @@ -100,7 +100,7 @@ private Font(Device device, long handle, int zoom) {
*/
public Font(Device device, FontData fd) {
super(device);
this.zoom = extractZoom(this.device);
this.zoom = DPIUtil.getNativeDeviceZoom();
init(fd);
this.fontHeight = fd.height;
init();
Expand Down Expand Up @@ -146,7 +146,7 @@ public Font(Device device, FontData[] fds) {
for (FontData fd : fds) {
if (fd == null) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
}
this.zoom = extractZoom(this.device);
this.zoom = DPIUtil.getNativeDeviceZoom();
FontData fd = fds[0];
init(fds[0]);
this.fontHeight = fd.height;
Expand Down Expand Up @@ -180,7 +180,7 @@ public Font(Device device, FontData[] fds) {
public Font(Device device, String name, int height, int style) {
super(device);
if (name == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
this.zoom = extractZoom(this.device);
this.zoom = DPIUtil.getNativeDeviceZoom();
init(new FontData (name, height, style));
this.fontHeight = height;
init();
Expand All @@ -189,7 +189,7 @@ public Font(Device device, String name, int height, int style) {
/*public*/ Font(Device device, String name, float height, int style) {
super(device);
if (name == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
this.zoom = extractZoom(this.device);
this.zoom = DPIUtil.getNativeDeviceZoom();
init(new FontData (name, height, style));
this.fontHeight = height;
init();
Expand Down Expand Up @@ -294,13 +294,6 @@ public String toString () {
return "Font {" + handle + "}";
}

private static int extractZoom(Device device) {
if (device == null) {
return DPIUtil.getNativeDeviceZoom();
}
return device.getDeviceZoom();
}

/**
* Invokes platform specific functionality to allocate a new font.
* <p>
Expand All @@ -318,7 +311,7 @@ private static int extractZoom(Device device) {
* @noreference This method is not intended to be referenced by clients.
*/
public static Font win32_new(Device device, long handle) {
int zoom = extractZoom(device);
int zoom = DPIUtil.getNativeDeviceZoom();
return win32_new(device, handle, zoom);
}

Expand Down
Loading