Replaced DPIUtil.get(Native)DeviceZoom calls

This commit replaces DPIUtil.get(Native)DeviceZoom calls for win32 and uses the zoom information available within the controls. contributes to #62 and #127
eclipse-platform · Jul 29, 2024 · 58180a4 · 58180a4
1 parent 24c8513
commit 58180a4
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/...clipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TableDragSourceEffect.java b/...clipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TableDragSourceEffect.java
@@ -147,7 +147,7 @@ Image getDragSourceImage(DragSourceEvent event) {
 					data.transparentPixel = shdi.crColorKey << 8;
 				}
 				Display display = control.getDisplay();
-				dragSourceImage = new Image(display, new AutoScaleImageDataProvider(display, data, DPIUtil.getDeviceZoom()));
+				dragSourceImage = new Image(display, new AutoScaleImageDataProvider(display, data, DPIUtil.getZoomForAutoscaleProperty(control.nativeZoom)));
 				OS.SelectObject (memHdc, oldMemBitmap);
 				OS.DeleteDC (memHdc);
 				OS.DeleteObject (memDib);

diff --git a/...eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TreeDragSourceEffect.java b/...eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TreeDragSourceEffect.java
@@ -146,7 +146,7 @@ Image getDragSourceImage(DragSourceEvent event) {
 					data.transparentPixel = shdi.crColorKey << 8;
 				}
 				Display display = control.getDisplay ();
-				dragSourceImage = new Image (display, new AutoScaleImageDataProvider(display, data, DPIUtil.getDeviceZoom()));
+				dragSourceImage = new Image (display, new AutoScaleImageDataProvider(display, data, DPIUtil.getZoomForAutoscaleProperty(control.nativeZoom)));
 				OS.SelectObject (memHdc, oldMemBitmap);
 				OS.DeleteDC (memHdc);
 				OS.DeleteObject (memDib);

diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Image.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Image.java
@@ -2229,7 +2229,7 @@ public long internal_new_GC (GCData data) {
 		data.device = device;
 		data.nativeZoom = initialNativeZoom;
 		data.image = this;
-		data.font = SWTFontProvider.getSystemFont(device, DPIUtil.getNativeDeviceZoom());
+		data.font = SWTFontProvider.getSystemFont(device, initialNativeZoom);
 	}
 	return imageDC;
 }