[win32] Make Font#extractZoom device independent

akoch-yatta · akoch-yatta · commit 41e45fd2c58b · 2025-03-25T17:32:33.000+01:00
This commit ensures Font#extractZoom is device independent. The previous
logic didn't provide any advantages anymore after the conversion between
points and pixels was changed for Fonts. By using DPIUtil#getNativeZoom
the most probable value for the zoom of a new font a chosen.
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Font.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Font.java
@@ -296,9 +296,9 @@ public String toString () {
 
 private static int extractZoom(Device device) {
 	if (device == null) {
-		return DPIUtil.getNativeDeviceZoom();
+		System.out.println ("***WARNING: Initializing a font with a null device will use the default device and can lead to errors when this font is used with another device."); //$NON-NLS-1$
 	}
-	return device.getDeviceZoom();
+	return DPIUtil.getNativeDeviceZoom();
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -296,9 +296,9 @@ public String toString () {`
`296`	`296`
`297`	`297`	`private static int extractZoom(Device device) {`
`298`	`298`	`if (device == null) {`
`299`		`- return DPIUtil.getNativeDeviceZoom();`
	`299`	`+ System.out.println ("***WARNING: Initializing a font with a null device will use the default device and can lead to errors when this font is used with another device."); //$NON-NLS-1$`
`300`	`300`	`}`
`301`		`- return device.getDeviceZoom();`
	`301`	`+ return DPIUtil.getNativeDeviceZoom();`
`302`	`302`	`}`
`303`	`303`
`304`	`304`	`/**`