Automatic refactoring: move Win32DPIUtils.pointToPixel(size,zoom) to DPIUtils

The change is required to do pointToPixel conversions in GTK and MACOS
which would be required in follow up PRs

Author: arunjose696

bundles/org.eclipse.swt/Eclipse SWT Browser/win32/org/eclipse/swt/browser/Edge.java

@@ -1323,8 +1323,8 @@ int handleContextMenuRequested(long pView, long pArgs) {
 	//   to PIXEL coordinates with the real native zoom value
 	//   independent from the swt.autoScale property:
 	Point pt = new Point( //
-			Win32DPIUtils.pointToPixel(win32Point.x, DPIUtil.getNativeDeviceZoom()), //
-			Win32DPIUtils.pointToPixel(win32Point.y, DPIUtil.getNativeDeviceZoom()));
+			DPIUtil.pointToPixel(win32Point.x, DPIUtil.getNativeDeviceZoom()), //
+			DPIUtil.pointToPixel(win32Point.y, DPIUtil.getNativeDeviceZoom()));
 	// - then, scale back down from PIXEL to DISPLAY coordinates, taking
 	//   swt.autoScale property into account
 	//   which is also later considered in Menu#setLocation()

bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/DragSource.java

@@ -538,8 +538,8 @@ private void drag(Event dragEvent) {
 		int flags = OS.RDW_UPDATENOW | OS.RDW_ALLCHILDREN;
 		OS.RedrawWindow (topControl.handle, null, 0, flags);
 		POINT pt = new POINT ();
-		pt.x = Win32DPIUtils.pointToPixel(dragEvent.x, zoom);// To Pixels
-		pt.y = Win32DPIUtils.pointToPixel(dragEvent.y, zoom);// To Pixels
+		pt.x = DPIUtil.pointToPixel(dragEvent.x, zoom);// To Pixels
+		pt.y = DPIUtil.pointToPixel(dragEvent.y, zoom);// To Pixels
 		OS.MapWindowPoints (control.handle, 0, pt, 1);
 		RECT rect = new RECT ();
 		OS.GetWindowRect (hwndDrag, rect);

bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/DPIUtil.java

@@ -24,15 +24,6 @@
 /**
  * This class hold common constants and utility functions w.r.t. to SWT high DPI
  * functionality.
- * <p>
- * The {@code autoScaleUp(..)} methods convert from API coordinates (in
- * SWT points) to internal high DPI coordinates (in pixels) that interface with
- * native widgets.
- * </p>
- * <p>
- * The {@code autoScaleDown(..)} convert from high DPI pixels to API coordinates
- * (in SWT points).
- * </p>
  *
  * @since 3.105
  */
@@ -257,6 +248,12 @@ public static void validateLinearScaling(ImageDataProvider provider) {
 	}
 }
 
+public static int pointToPixel(int size, int zoom) {
+	if (zoom == 100 || size == SWT.DEFAULT) return size;
+	float scaleFactor = getScalingFactor(zoom);
+	return Math.round (size * scaleFactor);
+}
+
 /**
  * Represents an element, such as some image data, at a specific zoom level.
  *

bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Cursor.java

@@ -598,11 +598,11 @@ public HotspotAwareCursorHandleProvider(int hotspotX, int hotspotY) {
 	}
 
 	protected final int getHotpotXInPixels(int zoom) {
-		return Win32DPIUtils.pointToPixel(hotspotX, zoom);
+		return DPIUtil.pointToPixel(hotspotX, zoom);
 	}
 
 	protected final int getHotpotYInPixels(int zoom) {
-		return Win32DPIUtils.pointToPixel(hotspotY, zoom);
+		return DPIUtil.pointToPixel(hotspotY, zoom);
 	}
 
 	protected static final void validateHotspotInsideImage(ImageData source, int hotspotX, int hotspotY) {

bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Image.java

@@ -2320,8 +2320,8 @@ private ImageHandle createHandle(int zoom) {
 
 	private long initHandle(int zoom) {
 		if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
-		int scaledWidth = Win32DPIUtils.pointToPixel (width, zoom);
-		int scaledHeight = Win32DPIUtils.pointToPixel (height, zoom);
+		int scaledWidth = DPIUtil.pointToPixel (width, zoom);
+		int scaledHeight = DPIUtil.pointToPixel (height, zoom);
 		long hDC = device.internal_new_GC(null);
 		long newHandle = OS.CreateCompatibleBitmap(hDC, scaledWidth, scaledHeight);
 		/*
@@ -2752,8 +2752,8 @@ protected ImageHandle newImageHandle(ZoomContext zoomContext) {
 		int gcStyle = drawer.getGcStyle();
 		Image image;
 		if ((gcStyle & SWT.TRANSPARENT) != 0) {
-			int scaledHeight = Win32DPIUtils.pointToPixel(height, targetZoom);
-			int scaledWidth = Win32DPIUtils.pointToPixel(width, targetZoom);
+			int scaledHeight = DPIUtil.pointToPixel(height, targetZoom);
+			int scaledWidth = DPIUtil.pointToPixel(width, targetZoom);
 			/* Create a 24 bit image data with alpha channel */
 			final ImageData resultData = new ImageData (scaledWidth, scaledHeight, 24, new PaletteData (0xFF, 0xFF00, 0xFF0000));
 			resultData.alphaData = new byte [scaledWidth * scaledHeight];

bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Region.java

@@ -202,8 +202,8 @@ public boolean contains (int x, int y) {
 	if (isDisposed()) SWT.error(SWT.ERROR_GRAPHIC_DISPOSED);
 	return applyUsingAnyHandle(regionHandle -> {
 		int zoom = regionHandle.zoom();
-		int xInPixels = Win32DPIUtils.pointToPixel(x, zoom);
-		int yInPixels = Win32DPIUtils.pointToPixel(y, zoom);
+		int xInPixels = DPIUtil.pointToPixel(x, zoom);
+		int yInPixels = DPIUtil.pointToPixel(y, zoom);
 		return containsInPixels(regionHandle.handle(), xInPixels, yInPixels);
 	});
 }

bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/TextLayout.java

@@ -379,9 +379,9 @@ void computeRuns (GC gc) {
 	}
 	SCRIPT_LOGATTR logAttr = new SCRIPT_LOGATTR();
 	SCRIPT_PROPERTIES properties = new SCRIPT_PROPERTIES();
-	int wrapIndentInPixels = Win32DPIUtils.pointToPixel(wrapIndent, getZoom(gc));
-	int indentInPixels = Win32DPIUtils.pointToPixel(indent, getZoom(gc));
-	int wrapWidthInPixels = Win32DPIUtils.pointToPixel(wrapWidth, getZoom(gc));
+	int wrapIndentInPixels = DPIUtil.pointToPixel(wrapIndent, getZoom(gc));
+	int indentInPixels = DPIUtil.pointToPixel(indent, getZoom(gc));
+	int wrapWidthInPixels = DPIUtil.pointToPixel(wrapWidth, getZoom(gc));
 	int[] tabsInPixels = Win32DPIUtils.pointToPixel(tabs, getZoom(gc));
 	int lineWidth = indentInPixels, lineStart = 0, lineCount = 1;
 	for (int i=0; i<allRuns.length - 1; i++) {
@@ -1896,8 +1896,8 @@ Rectangle getBoundsInPixels (int start, int end) {
 		}
 		left = Math.min(left, runLead);
 		right = Math.max(right, runTrail);
-		top = Math.min(top, Win32DPIUtils.pointToPixel(lineY[lineIndex], getZoom(null)));
-		bottom = Math.max(bottom, Win32DPIUtils.pointToPixel(lineY[lineIndex + 1] - lineSpacingInPoints, getZoom(null)));
+		top = Math.min(top, DPIUtil.pointToPixel(lineY[lineIndex], getZoom(null)));
+		bottom = Math.max(bottom, DPIUtil.pointToPixel(lineY[lineIndex + 1] - lineSpacingInPoints, getZoom(null)));
 	}
 	return new Rectangle(left, top, right - left, bottom - top + getScaledVerticalIndent());
 }
@@ -2057,14 +2057,14 @@ int getLineIndent(int lineIndex) {
 }
 
 int getLineIndentInPixel (int lineIndex) {
-	int lineIndent = Win32DPIUtils.pointToPixel(wrapIndent, getZoom());
+	int lineIndent = DPIUtil.pointToPixel(wrapIndent, getZoom());
 	if (lineIndex == 0) {
-		lineIndent = Win32DPIUtils.pointToPixel(indent, getZoom());
+		lineIndent = DPIUtil.pointToPixel(indent, getZoom());
 	} else {
 		StyleItem[] previousLine = runs[lineIndex - 1];
 		StyleItem previousRun = previousLine[previousLine.length - 1];
 		if (previousRun.lineBreak && !previousRun.softBreak) {
-			lineIndent = Win32DPIUtils.pointToPixel(indent, getZoom());
+			lineIndent = DPIUtil.pointToPixel(indent, getZoom());
 		}
 	}
 	if (wrapWidth != -1) {
@@ -2078,8 +2078,8 @@ int getLineIndentInPixel (int lineIndex) {
 		if (partialLine) {
 			int lineWidth = this.lineWidthInPixels[lineIndex] + lineIndent;
 			switch (alignment) {
-				case SWT.CENTER: lineIndent += (Win32DPIUtils.pointToPixel(wrapWidth, getZoom()) - lineWidth) / 2; break;
-				case SWT.RIGHT: lineIndent += Win32DPIUtils.pointToPixel(wrapWidth, getZoom()) - lineWidth; break;
+				case SWT.CENTER: lineIndent += (DPIUtil.pointToPixel(wrapWidth, getZoom()) - lineWidth) / 2; break;
+				case SWT.RIGHT: lineIndent += DPIUtil.pointToPixel(wrapWidth, getZoom()) - lineWidth; break;
 			}
 		}
 	}

bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/ImageList.java

@@ -337,8 +337,8 @@ public int getStyle () {
 
 public long getHandle(int targetZoom) {
 	if (!zoomToHandle.containsKey(targetZoom)) {
-		int scaledWidth = Win32DPIUtils.pointToPixel(DPIUtil.pixelToPoint(width, this.zoom), targetZoom);
-		int scaledHeight = Win32DPIUtils.pointToPixel(DPIUtil.pixelToPoint(height, this.zoom), targetZoom);
+		int scaledWidth = DPIUtil.pointToPixel(DPIUtil.pixelToPoint(width, this.zoom), targetZoom);
+		int scaledHeight = DPIUtil.pointToPixel(DPIUtil.pixelToPoint(height, this.zoom), targetZoom);
 		long newImageListHandle = OS.ImageList_Create(scaledWidth, scaledHeight, flags, 16, 16);
 		int count = OS.ImageList_GetImageCount (handle);
 		for (int i = 0; i < count; i++) {

bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/internal/Win32DPIUtils.java

@@ -207,18 +207,9 @@ public static int[] pointToPixel(Drawable drawable, int[] pointArray, int zoom)
 		return pointToPixel (pointArray, zoom);
 	}
 
-	/**
-	 * Auto-scale up int dimensions to match the given zoom level
-	 */
-	public static int pointToPixel(int size, int zoom) {
-		if (zoom == 100 || size == SWT.DEFAULT) return size;
-		float scaleFactor = DPIUtil.getScalingFactor(zoom);
-		return Math.round (size * scaleFactor);
-	}
-
 	public static int pointToPixel(Drawable drawable, int size, int zoom) {
 		if (drawable != null && !drawable.isAutoScalable()) return size;
-		return pointToPixel (size, zoom);
+		return DPIUtil.pointToPixel (size, zoom);
 	}
 
 	public static float pointToPixel(float size, int zoom) {

bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Button.java

@@ -360,10 +360,10 @@ else if ((style & SWT.RIGHT) != 0) {
 					Rectangle rect = Win32DPIUtils.scaleBounds(image.getBounds(), this.getZoom(), 100);
 					width = rect.width;
 					if (hasText && text.length () != 0) {
-						width += Win32DPIUtils.pointToPixel(MARGIN * 2, getZoom());;
+						width += DPIUtil.pointToPixel(MARGIN * 2, getZoom());;
 					}
 					height = rect.height;
-					extra = Win32DPIUtils.pointToPixel(MARGIN * 2, getZoom());;
+					extra = DPIUtil.pointToPixel(MARGIN * 2, getZoom());;
 				}
 			}
 			if (hasText) {
@@ -377,7 +377,7 @@ else if ((style & SWT.RIGHT) != 0) {
 				if (length == 0) {
 					height = Math.max (height, lptm.tmHeight);
 				} else {
-					extra = Math.max (Win32DPIUtils.pointToPixel(MARGIN * 2, getZoom()), lptm.tmAveCharWidth);
+					extra = Math.max (DPIUtil.pointToPixel(MARGIN * 2, getZoom()), lptm.tmAveCharWidth);
 					char [] buffer = text.toCharArray ();
 					RECT rect = new RECT ();
 					int flags = OS.DT_CALCRECT | OS.DT_SINGLELINE;
@@ -1313,7 +1313,7 @@ private int getCheckboxTextOffset(long hdc) {
 		OS.GetThemePartSize(display.hButtonTheme(nativeZoom), hdc, OS.BP_CHECKBOX, OS.CBS_UNCHECKEDNORMAL, null, OS.TS_TRUE, size);
 		result += size.cx;
 	} else {
-		result += Win32DPIUtils.pointToPixel(13, nativeZoom);
+		result += DPIUtil.pointToPixel(13, nativeZoom);
 	}
 
 	// Windows uses half width of '0' as checkbox-to-text distance.