[win32] Use consistent font zoom retrieval

akoch-yatta · HeikoKlare · commit 033d73320e62 · 2025-04-24T17:51:40.000+02:00
This commit unifies the extraction of the target zoom of a font to be
affected by the zoom context of the underlying Widget. Before there
were different strategies like getting it from the Shell.
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Caret.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Caret.java
@@ -152,7 +152,7 @@ public Font getFont () {
 	checkWidget();
 	if (font == null) {
 		long hFont = defaultFont ();
-		return Font.win32_new (display, hFont, getZoom());
+		return Font.win32_new (display, hFont, getNativeZoom());
 	}
 	return font;
 }
@@ -478,8 +478,7 @@ public void setFont (Font font) {
 	if (font != null && font.isDisposed ()) {
 		error (SWT.ERROR_INVALID_ARGUMENT);
 	}
-	Shell shell = parent.getShell();
-	this.font = font == null ? null : Font.win32_new(font, shell.nativeZoom);
+	this.font = font == null ? null : Font.win32_new(font, getNativeZoom());
 	if (hasFocus ()) setIMEFont ();
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Composite.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Composite.java
@@ -1525,7 +1525,7 @@ LRESULT WM_PAINT (long wParam, long lParam) {
 					Control control = findBackgroundControl ();
 					if (control == null) control = this;
 					data.background = control.getBackgroundPixel ();
-					data.font = Font.win32_new(display, OS.SendMessage (handle, OS.WM_GETFONT, 0, 0), nativeZoom);
+					data.font = Font.win32_new(display, OS.SendMessage (handle, OS.WM_GETFONT, 0, 0), getNativeZoom());
 					data.uiState = (int)OS.SendMessage (handle, OS.WM_QUERYUISTATE, 0, 0);
 					if ((style & SWT.NO_BACKGROUND) != 0) {
 						/* This code is intentionally commented because it may be slow to copy bits from the screen */
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Control.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Control.java
@@ -721,7 +721,7 @@ int defaultBackground () {
 }
 
 long defaultFont() {
-	return display.getSystemFont(getShell().nativeZoom).handle;
+	return display.getSystemFont(getNativeZoom()).handle;
 }
 
 int defaultForeground () {
@@ -1315,7 +1315,7 @@ public Font getFont () {
 	if (font != null) return font;
 	long hFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0);
 	if (hFont == 0) hFont = defaultFont ();
-	return Font.win32_new (display, hFont, getShell().nativeZoom);
+	return Font.win32_new (display, hFont, getNativeZoom());
 }
 
 /**
@@ -3330,7 +3330,7 @@ public void setCursor (Cursor cursor) {
 }
 
 void setDefaultFont () {
-	long hFont = display.getSystemFont (getShell().nativeZoom).handle;
+	long hFont = display.getSystemFont (getNativeZoom()).handle;
 	OS.SendMessage (handle, OS.WM_SETFONT, hFont, 0);
 }
 
@@ -3432,7 +3432,7 @@ public void setFont (Font font) {
 	Font newFont = font;
 	if (newFont != null) {
 		if (newFont.isDisposed()) error(SWT.ERROR_INVALID_ARGUMENT);
-		newFont = Font.win32_new(newFont, getShell().nativeZoom);
+		newFont = Font.win32_new(newFont, getNativeZoom());
 	}
 	long hFont = 0;
 	if (newFont != null) {
@@ -5869,7 +5869,7 @@ private static void handleDPIChange(Widget widget, int newZoom, float scalingFac
 	if (!(widget instanceof Control control)) {
 		return;
 	}
-	resizeFont(control, control.getShell().nativeZoom);
+	resizeFont(control, control.getNativeZoom());
 
 	Image image = control.backgroundImage;
 	if (image != null) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TableItem.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TableItem.java
@@ -870,8 +870,7 @@ public void setFont (Font font){
 		error (SWT.ERROR_INVALID_ARGUMENT);
 	}
 	Font oldFont = this.font;
-	Shell shell = parent.getShell();
-	Font newFont = (font == null ? font : Font.win32_new(font, shell.nativeZoom));
+	Font newFont = (font == null ? font : Font.win32_new(font, getNativeZoom()));
 	if (oldFont == newFont) return;
 	this.font = newFont;
 	if (oldFont != null && oldFont.equals (newFont)) return;
@@ -936,7 +935,7 @@ public void setFont (int index, Font font) {
 	}
 	Font oldFont = cellFont [index];
 	if (oldFont == font) return;
-	cellFont [index] = font == null ? font : Font.win32_new(font, nativeZoom);
+	cellFont [index] = font == null ? font : Font.win32_new(font, getNativeZoom());
 	if (oldFont != null && oldFont.equals (font)) return;
 	if (font != null) parent.setCustomDraw (true);
 	if ((parent.style & SWT.VIRTUAL) != 0) cached = true;
@@ -1282,10 +1281,9 @@ private static void handleDPIChange(Widget widget, int newZoom, float scalingFac
 	}
 	Font[] cellFonts = tableItem.cellFont;
 	if (cellFonts != null) {
-		Shell shell = tableItem.parent.getShell();
 		for (int index = 0; index < cellFonts.length; index++) {
 			Font cellFont = cellFonts[index];
-			cellFonts[index] = cellFont == null ? null : Font.win32_new(cellFont, shell.nativeZoom);
+			cellFonts[index] = cellFont == null ? null : Font.win32_new(cellFont, tableItem.getNativeZoom());
 		}
 	}
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TreeItem.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TreeItem.java
@@ -1388,8 +1388,7 @@ public void setFont (Font font){
 		error (SWT.ERROR_INVALID_ARGUMENT);
 	}
 	Font oldFont = this.font;
-	Shell shell = parent.getShell();
-	Font newFont = (font == null ? font : Font.win32_new(font, shell.nativeZoom));
+	Font newFont = (font == null ? font : Font.win32_new(font, getNativeZoom()));
 	if (oldFont == newFont) return;
 	this.font = newFont;
 	if (oldFont != null && oldFont.equals (font)) return;
@@ -1445,8 +1444,7 @@ public void setFont (int index, Font font) {
 	}
 	Font oldFont = cellFont [index];
 	if (oldFont == font) return;
-	Shell shell = parent.getShell();
-	cellFont [index] = font == null ? font : Font.win32_new(font, shell.nativeZoom);
+	cellFont [index] = font == null ? font : Font.win32_new(font, getNativeZoom());
 	if (oldFont != null && oldFont.equals (font)) return;
 	if (font != null) parent.customDraw = true;
 	if ((parent.style & SWT.VIRTUAL) != 0) cached = true;
@@ -1828,10 +1826,9 @@ private static void handleDPIChange(Widget widget, int newZoom, float scalingFac
 	}
 	Font[] cellFonts = treeItem.cellFont;
 	if (cellFonts != null) {
-		Shell shell = treeItem.parent.getShell();
 		for (int index = 0; index < cellFonts.length; index++) {
 			Font cellFont = cellFonts[index];
-			cellFonts[index] = cellFont == null ? null : Font.win32_new(cellFont, shell.nativeZoom);
+			cellFonts[index] = cellFont == null ? null : Font.win32_new(cellFont, treeItem.getNativeZoom());
 		}
 	}
 	for (TreeItem item : treeItem.getItems()) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Widget.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Widget.java
@@ -2690,6 +2690,10 @@ GC createNewGC(long hDC, GCData data) {
 	return GC.win32_new(hDC, data);
 }
 
+int getNativeZoom() {
+	return nativeZoom;
+}
+
 int getZoom() {
 	return DPIUtil.getZoomForAutoscaleProperty(nativeZoom);
 }

Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ public Font getFont () {`
`152`	`152`	`checkWidget();`
`153`	`153`	`if (font == null) {`
`154`	`154`	`long hFont = defaultFont ();`
`155`		`- return Font.win32_new (display, hFont, getZoom());`
	`155`	`+ return Font.win32_new (display, hFont, getNativeZoom());`
`156`	`156`	`}`
`157`	`157`	`return font;`
`158`	`158`	`}`
`@@ -478,8 +478,7 @@ public void setFont (Font font) {`
`478`	`478`	`if (font != null && font.isDisposed ()) {`
`479`	`479`	`error (SWT.ERROR_INVALID_ARGUMENT);`
`480`	`480`	`}`
`481`		`- Shell shell = parent.getShell();`
`482`		`- this.font = font == null ? null : Font.win32_new(font, shell.nativeZoom);`
	`481`	`+ this.font = font == null ? null : Font.win32_new(font, getNativeZoom());`
`483`	`482`	`if (hasFocus ()) setIMEFont ();`
`484`	`483`	`}`
`485`	`484`
Original file line number	Diff line number	Diff line change
`@@ -721,7 +721,7 @@ int defaultBackground () {`
`721`	`721`	`}`
`722`	`722`
`723`	`723`	`long defaultFont() {`
`724`		`- return display.getSystemFont(getShell().nativeZoom).handle;`
	`724`	`+ return display.getSystemFont(getNativeZoom()).handle;`
`725`	`725`	`}`
`726`	`726`
`727`	`727`	`int defaultForeground () {`
`@@ -1315,7 +1315,7 @@ public Font getFont () {`
`1315`	`1315`	`if (font != null) return font;`
`1316`	`1316`	`long hFont = OS.SendMessage (handle, OS.WM_GETFONT, 0, 0);`
`1317`	`1317`	`if (hFont == 0) hFont = defaultFont ();`
`1318`		`- return Font.win32_new (display, hFont, getShell().nativeZoom);`
	`1318`	`+ return Font.win32_new (display, hFont, getNativeZoom());`
`1319`	`1319`	`}`
`1320`	`1320`
`1321`	`1321`	`/**`
`@@ -3330,7 +3330,7 @@ public void setCursor (Cursor cursor) {`
`3330`	`3330`	`}`
`3331`	`3331`
`3332`	`3332`	`void setDefaultFont () {`
`3333`		`- long hFont = display.getSystemFont (getShell().nativeZoom).handle;`
	`3333`	`+ long hFont = display.getSystemFont (getNativeZoom()).handle;`
`3334`	`3334`	`OS.SendMessage (handle, OS.WM_SETFONT, hFont, 0);`
`3335`	`3335`	`}`
`3336`	`3336`
`@@ -3432,7 +3432,7 @@ public void setFont (Font font) {`
`3432`	`3432`	`Font newFont = font;`
`3433`	`3433`	`if (newFont != null) {`
`3434`	`3434`	`if (newFont.isDisposed()) error(SWT.ERROR_INVALID_ARGUMENT);`
`3435`		`- newFont = Font.win32_new(newFont, getShell().nativeZoom);`
	`3435`	`+ newFont = Font.win32_new(newFont, getNativeZoom());`
`3436`	`3436`	`}`
`3437`	`3437`	`long hFont = 0;`
`3438`	`3438`	`if (newFont != null) {`
`@@ -5869,7 +5869,7 @@ private static void handleDPIChange(Widget widget, int newZoom, float scalingFac`
`5869`	`5869`	`if (!(widget instanceof Control control)) {`
`5870`	`5870`	`return;`
`5871`	`5871`	`}`
`5872`		`- resizeFont(control, control.getShell().nativeZoom);`
	`5872`	`+ resizeFont(control, control.getNativeZoom());`
`5873`	`5873`
`5874`	`5874`	`Image image = control.backgroundImage;`
`5875`	`5875`	`if (image != null) {`
Original file line number	Diff line number	Diff line change
`@@ -870,8 +870,7 @@ public void setFont (Font font){`
`870`	`870`	`error (SWT.ERROR_INVALID_ARGUMENT);`
`871`	`871`	`}`
`872`	`872`	`Font oldFont = this.font;`
`873`		`- Shell shell = parent.getShell();`
`874`		`- Font newFont = (font == null ? font : Font.win32_new(font, shell.nativeZoom));`
	`873`	`+ Font newFont = (font == null ? font : Font.win32_new(font, getNativeZoom()));`
`875`	`874`	`if (oldFont == newFont) return;`
`876`	`875`	`this.font = newFont;`
`877`	`876`	`if (oldFont != null && oldFont.equals (newFont)) return;`
`@@ -936,7 +935,7 @@ public void setFont (int index, Font font) {`
`936`	`935`	`}`
`937`	`936`	`Font oldFont = cellFont [index];`
`938`	`937`	`if (oldFont == font) return;`
`939`		`- cellFont [index] = font == null ? font : Font.win32_new(font, nativeZoom);`
	`938`	`+ cellFont [index] = font == null ? font : Font.win32_new(font, getNativeZoom());`
`940`	`939`	`if (oldFont != null && oldFont.equals (font)) return;`
`941`	`940`	`if (font != null) parent.setCustomDraw (true);`
`942`	`941`	`if ((parent.style & SWT.VIRTUAL) != 0) cached = true;`
`@@ -1282,10 +1281,9 @@ private static void handleDPIChange(Widget widget, int newZoom, float scalingFac`
`1282`	`1281`	`}`
`1283`	`1282`	`Font[] cellFonts = tableItem.cellFont;`
`1284`	`1283`	`if (cellFonts != null) {`
`1285`		`- Shell shell = tableItem.parent.getShell();`
`1286`	`1284`	`for (int index = 0; index < cellFonts.length; index++) {`
`1287`	`1285`	`Font cellFont = cellFonts[index];`
`1288`		`- cellFonts[index] = cellFont == null ? null : Font.win32_new(cellFont, shell.nativeZoom);`
	`1286`	`+ cellFonts[index] = cellFont == null ? null : Font.win32_new(cellFont, tableItem.getNativeZoom());`
`1289`	`1287`	`}`
`1290`	`1288`	`}`
`1291`	`1289`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2690,6 +2690,10 @@ GC createNewGC(long hDC, GCData data) {`
`2690`	`2690`	`return GC.win32_new(hDC, data);`
`2691`	`2691`	`}`
`2692`	`2692`
	`2693`	`+int getNativeZoom() {`
	`2694`	`+ return nativeZoom;`
	`2695`	`+}`
	`2696`	`+`
`2693`	`2697`	`int getZoom() {`
`2694`	`2698`	`return DPIUtil.getZoomForAutoscaleProperty(nativeZoom);`
`2695`	`2699`	`}`