Refactor: Replace autoScale calls with scaleUp/Down

Removing all autoScale method from DPIUtil and replace it usages with
scaleDown/Up method and pass the zoom from the caller side

Author: ShahzaibIbrahim

bundles/org.eclipse.swt/Eclipse SWT AWT/win32/org/eclipse/swt/awt/SWT_AWT.java

@@ -294,7 +294,7 @@ public void componentResized (ComponentEvent e) {
 			display.syncExec (() -> {
 				if (shell.isDisposed()) return;
 				Dimension dim = parent.getSize ();
-				shell.setSize(DPIUtil.autoScaleDown(new Point(dim.width, dim.height))); // To Points
+				shell.setSize(DPIUtil.scaleDown(new Point(dim.width, dim.height), DPIUtil.getDeviceZoom())); // To Points
 			});
 		}
 	};

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

@@ -1880,7 +1880,7 @@ void handleDOMEvent (OleEvent e) {
 	int screenY = pVarResult.getInt();
 	pVarResult.dispose();
 
-	Point position = DPIUtil.autoScaleDown(new Point(screenX, screenY)); // To Points
+	Point position = DPIUtil.scaleDown(new Point(screenX, screenY), DPIUtil.getDeviceZoom()); // To Points
 	position = browser.getDisplay().map(null, browser, position);
 	newEvent.x = position.x; newEvent.y = position.y;
 

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

@@ -320,8 +320,8 @@ int ShowContextMenu(int dwID, long ppt, long pcmdtReserved, long pdispReserved)
 	Event event = new Event();
 	POINT pt = new POINT();
 	OS.MoveMemory(pt, ppt, POINT.sizeof);
-	pt.x = DPIUtil.autoScaleDown(pt.x); // To Points
-	pt.y = DPIUtil.autoScaleDown(pt.y); // To Points
+	pt.x = DPIUtil.scaleDown(pt.x, DPIUtil.getDeviceZoom()); // To Points
+	pt.y = DPIUtil.scaleDown(pt.y, DPIUtil.getDeviceZoom()); // To Points
 	event.x = pt.x;
 	event.y = pt.y;
 	browser.notifyListeners(SWT.MenuDetect, event);

bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/ImageData.java

@@ -2609,35 +2609,36 @@ static void buildDitheredGradientChannel(int from, int to, int steps,
  * @param redBits the number of significant red bits, 0 for palette modes
  * @param greenBits the number of significant green bits, 0 for palette modes
  * @param blueBits the number of significant blue bits, 0 for palette modes
+ * @param zoom the zoom of gc drawer used
  */
 static void fillGradientRectangle(GC gc, Device device,
 	int x, int y, int width, int height, boolean vertical,
 	RGB fromRGB, RGB toRGB,
-	int redBits, int greenBits, int blueBits) {
+	int redBits, int greenBits, int blueBits, int zoom) {
 	/* Create the bitmap and tile it */
 	ImageData band = createGradientBand(width, height, vertical,
 		fromRGB, toRGB, redBits, greenBits, blueBits);
 	Image image = new Image(device, band);
 	if ((band.width == 1) || (band.height == 1)) {
-			gc.drawImage(image, 0, 0, DPIUtil.autoScaleDown(band.width), DPIUtil.autoScaleDown(band.height),
-					DPIUtil.autoScaleDown(x), DPIUtil.autoScaleDown(y), DPIUtil.autoScaleDown(width),
-					DPIUtil.autoScaleDown(height));
+			gc.drawImage(image, 0, 0, DPIUtil.scaleDown(band.width, zoom), DPIUtil.scaleDown(band.height, zoom),
+					DPIUtil.scaleDown(x, zoom), DPIUtil.scaleDown(y, zoom), DPIUtil.scaleDown(width, zoom),
+					DPIUtil.scaleDown(height, zoom));
 		} else {
 		if (vertical) {
 			for (int dx = 0; dx < width; dx += band.width) {
 				int blitWidth = width - dx;
 				if (blitWidth > band.width) blitWidth = band.width;
-					gc.drawImage(image, 0, 0, DPIUtil.autoScaleDown(blitWidth), DPIUtil.autoScaleDown(band.height),
-							DPIUtil.autoScaleDown(dx + x), DPIUtil.autoScaleDown(y), DPIUtil.autoScaleDown(blitWidth),
-							DPIUtil.autoScaleDown(band.height));
+					gc.drawImage(image, 0, 0, DPIUtil.scaleDown(blitWidth, zoom), DPIUtil.scaleDown(band.height, zoom),
+							DPIUtil.scaleDown(dx + x, zoom), DPIUtil.scaleDown(y, zoom), DPIUtil.scaleDown(blitWidth, zoom),
+							DPIUtil.scaleDown(band.height, zoom));
 				}
 		} else {
 			for (int dy = 0; dy < height; dy += band.height) {
 				int blitHeight = height - dy;
 				if (blitHeight > band.height) blitHeight = band.height;
-					gc.drawImage(image, 0, 0, DPIUtil.autoScaleDown(band.width), DPIUtil.autoScaleDown(blitHeight),
-							DPIUtil.autoScaleDown(x), DPIUtil.autoScaleDown(dy + y), DPIUtil.autoScaleDown(band.width),
-							DPIUtil.autoScaleDown(blitHeight));
+					gc.drawImage(image, 0, 0, DPIUtil.scaleDown(band.width, zoom), DPIUtil.scaleDown(blitHeight, zoom),
+							DPIUtil.scaleDown(x, zoom), DPIUtil.scaleDown(dy + y, zoom), DPIUtil.scaleDown(band.width, zoom),
+							DPIUtil.scaleDown(blitHeight, zoom));
 				}
 		}
 	}

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

@@ -116,37 +116,6 @@ public static Optional<AutoScaleMethod> forString(String s) {
 		autoScaleMethod = AUTO_SCALE_METHOD_SETTING != AutoScaleMethod.AUTO ? AUTO_SCALE_METHOD_SETTING : AutoScaleMethod.NEAREST;
 	}
 
-/**
- * Auto-scale down ImageData
- */
-public static ImageData autoScaleDown (Device device, final ImageData imageData) {
-	if (deviceZoom == 100 || imageData == null || (device != null && !device.isAutoScalable())) return imageData;
-	float scaleFactor = 1.0f / getScalingFactor (deviceZoom);
-	return autoScaleImageData(device, imageData, scaleFactor);
-}
-
-public static int[] autoScaleDown(int[] pointArray) {
-	if (deviceZoom == 100 || pointArray == null) return pointArray;
-	float scaleFactor = getScalingFactor (deviceZoom);
-	int [] returnArray = new int[pointArray.length];
-	for (int i = 0; i < pointArray.length; i++) {
-		returnArray [i] =  Math.round (pointArray [i] / scaleFactor);
-	}
-	return returnArray;
-}
-
-public static int[] autoScaleDown(Drawable drawable, int[] pointArray) {
-	if (drawable != null && !drawable.isAutoScalable ()) return pointArray;
-	return autoScaleDown (pointArray);
-}
-
-/**
- * Auto-scale down float array dimensions.
- */
-public static float[] autoScaleDown(float size[]) {
-	return scaleDown(size, deviceZoom);
-}
-
 public static float[] scaleDown(float size[], int zoom) {
 	if (zoom == 100 || size == null) return size;
 	float scaleFactor = getScalingFactor (zoom);
@@ -157,75 +126,33 @@ public static float[] scaleDown(float size[], int zoom) {
 	return scaledSize;
 }
 
-/**
- * Auto-scale down float array dimensions if enabled for Drawable class.
- */
-public static float[] autoScaleDown(Drawable drawable, float size[]) {
-	return scaleDown(drawable, size, deviceZoom);
-}
-
 public static float[] scaleDown(Drawable drawable, float size[], int zoom) {
 	if (drawable != null && !drawable.isAutoScalable()) return size;
 	return scaleDown(size, zoom);
 }
 
-/**
- * Auto-scale down int dimensions.
- */
-public static int autoScaleDown(int size) {
-	return scaleDown(size, deviceZoom);
-}
-
 public static int scaleDown(int size, int zoom) {
 	if (zoom == 100 || size == SWT.DEFAULT) return size;
 	float scaleFactor = getScalingFactor (zoom);
 	return Math.round (size / scaleFactor);
 }
 
-/**
- * Auto-scale down int dimensions if enabled for Drawable class.
- */
-public static int autoScaleDown(Drawable drawable, int size) {
-	return scaleDown(drawable, size, deviceZoom);
-}
-
 public static int scaleDown(Drawable drawable, int size, int zoom) {
 	if (drawable != null && !drawable.isAutoScalable()) return size;
 	return scaleDown (size, zoom);
 }
 
-/**
- * Auto-scale down float dimensions.
- */
-public static float autoScaleDown(float size) {
-	return scaleDown(size, deviceZoom);
-}
-
 public static float scaleDown(float size, int zoom) {
 	if (zoom == 100 || size == SWT.DEFAULT) return size;
 	float scaleFactor = getScalingFactor (zoom);
 	return (size / scaleFactor);
 }
 
-/**
- * Auto-scale down float dimensions if enabled for Drawable class.
- */
-public static float autoScaleDown(Drawable drawable, float size) {
-	return scaleDown (drawable, size, deviceZoom);
-}
-
 public static float scaleDown(Drawable drawable, float size, int zoom) {
 	if (drawable != null && !drawable.isAutoScalable()) return size;
 	return scaleDown (size, zoom);
 }
 
-/**
- * Returns a new scaled down Point.
- */
-public static Point autoScaleDown(Point point) {
-	return scaleDown(point, deviceZoom);
-}
-
 public static Point scaleDown(Point point, int zoom) {
 	if (zoom == 100 || point == null) return point;
 	Point.OfFloat fPoint = FloatAwareGeometryFactory.createFrom(point);
@@ -235,35 +162,14 @@ public static Point scaleDown(Point point, int zoom) {
 	return new Point.OfFloat(scaledX, scaledY);
 }
 
-/**
- * Returns a new scaled down Point if enabled for Drawable class.
- */
-public static Point autoScaleDown(Drawable drawable, Point point) {
-	return scaleDown(drawable, point, deviceZoom);
-}
-
 public static Point scaleDown(Drawable drawable, Point point, int zoom) {
 	if (drawable != null && !drawable.isAutoScalable()) return point;
 	return scaleDown (point, zoom);
 }
 
-/**
- * Returns a new scaled down Rectangle.
- */
-public static Rectangle autoScaleDown(Rectangle rect) {
-	return scaleDown(rect, deviceZoom);
-}
-
 public static Rectangle scaleDown(Rectangle rect, int zoom) {
 	return scaleBounds(rect, 100, zoom);
 }
-/**
- * Returns a new scaled down Rectangle if enabled for Drawable class.
- */
-public static Rectangle autoScaleDown(Drawable drawable, Rectangle rect) {
-	if (drawable != null && !drawable.isAutoScalable()) return rect;
-	return scaleDown(rect, deviceZoom);
-}
 
 public static Rectangle scaleDown(Drawable drawable, Rectangle rect, int zoom) {
 	if (drawable != null && !drawable.isAutoScalable()) return rect;
@@ -342,17 +248,6 @@ public static ImageData autoScaleImageData (Device device, final ImageData image
 	return autoScaleImageData(device, imageData, scaleFactor);
 }
 
-/**
- * Auto-scale up ImageData to device zoom that is at 100%.
- */
-public static ImageData autoScaleUp (Device device, final ImageData imageData) {
-	return autoScaleImageData(device, imageData, 100);
-}
-
-public static int[] autoScaleUp(int[] pointArray) {
-	return scaleUp(pointArray, deviceZoom);
-}
-
 public static int[] scaleUp(int[] pointArray, int zoom) {
 	if (zoom == 100 || pointArray == null) return pointArray;
 	float scaleFactor = getScalingFactor(zoom);
@@ -363,20 +258,10 @@ public static int[] scaleUp(int[] pointArray, int zoom) {
 	return returnArray;
 }
 
-public static int[] autoScaleUp(Drawable drawable, int[] pointArray) {
-	return scaleUp(drawable, pointArray, deviceZoom);
-}
-
 public static int[] scaleUp(Drawable drawable, int[] pointArray, int zoom) {
 	if (drawable != null && !drawable.isAutoScalable()) return pointArray;
 	return scaleUp (pointArray, zoom);
 }
-/**
- * Auto-scale up int dimensions.
- */
-public static int autoScaleUp(int size) {
-	return scaleUp(size, deviceZoom);
-}
 
 /**
  * Auto-scale up int dimensions to match the given zoom level
@@ -387,44 +272,22 @@ public static int scaleUp(int size, int zoom) {
 	return Math.round (size * scaleFactor);
 }
 
-/**
- * Auto-scale up int dimensions if enabled for Drawable class.
- */
-public static int autoScaleUp(Drawable drawable, int size) {
-	return scaleUp(drawable, size, deviceZoom);
-}
-
 public static int scaleUp(Drawable drawable, int size, int zoom) {
 	if (drawable != null && !drawable.isAutoScalable()) return size;
 	return scaleUp (size, zoom);
 }
 
-public static float autoScaleUp(float size) {
-	return scaleUp(size, deviceZoom);
-}
-
 public static float scaleUp(float size, int zoom) {
 	if (zoom == 100 || size == SWT.DEFAULT) return size;
 	float scaleFactor = getScalingFactor(zoom);
 	return (size * scaleFactor);
 }
 
-public static float autoScaleUp(Drawable drawable, float size) {
-	return scaleUp(drawable, size, deviceZoom);
-}
-
 public static float scaleUp(Drawable drawable, float size, int zoom) {
 	if (drawable != null && !drawable.isAutoScalable()) return size;
 	return scaleUp (size, zoom);
 }
 
-/**
- * Returns a new scaled up Point.
- */
-public static Point autoScaleUp(Point point) {
-	return scaleUp(point, deviceZoom);
-}
-
 public static Point scaleUp(Point point, int zoom) {
 	if (zoom == 100 || point == null) return point;
 	Point.OfFloat fPoint = FloatAwareGeometryFactory.createFrom(point);
@@ -434,36 +297,15 @@ public static Point scaleUp(Point point, int zoom) {
 	return new Point.OfFloat(scaledX, scaledY);
 }
 
-/**
- * Returns a new scaled up Point if enabled for Drawable class.
- */
-public static Point autoScaleUp(Drawable drawable, Point point) {
-	return scaleUp (drawable, point, deviceZoom);
-}
-
 public static Point scaleUp(Drawable drawable, Point point, int zoom) {
 	if (drawable != null && !drawable.isAutoScalable()) return point;
 	return scaleUp (point, zoom);
 }
 
-/**
- * Returns a new scaled up Rectangle.
- */
-public static Rectangle autoScaleUp(Rectangle rect) {
-	return scaleUp(rect, deviceZoom);
-}
-
 public static Rectangle scaleUp(Rectangle rect, int zoom) {
 	return scaleBounds(rect, zoom, 100);
 }
 
-/**
- * Returns a new scaled up Rectangle if enabled for Drawable class.
- */
-public static Rectangle autoScaleUp(Drawable drawable, Rectangle rect) {
-	return scaleUp(drawable, rect, deviceZoom);
-}
-
 public static Rectangle scaleUp(Drawable drawable, Rectangle rect, int zoom) {
 	if (drawable != null && !drawable.isAutoScalable()) return rect;
 	return scaleUp (rect, zoom);

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

@@ -3089,11 +3089,11 @@ private class FillGradientRectangleOperation extends FillRectangleOperation {
 	@Override
 	void apply() {
 		Rectangle rect = DPIUtil.scaleUp(drawable, rectangle, getZoom());
-		fillGradientRectangleInPixels(rect.x, rect.y, rect.width, rect.height, vertical);
+		fillGradientRectangleInPixels(rect.x, rect.y, rect.width, rect.height, vertical, getZoom());
 	}
 }
 
-private void fillGradientRectangleInPixels(int x, int y, int width, int height, boolean vertical) {
+private void fillGradientRectangleInPixels(int x, int y, int width, int height, boolean vertical, int zoom) {
 	if (width == 0 || height == 0) return;
 
 	RGB backgroundRGB, foregroundRGB;
@@ -3183,7 +3183,7 @@ private void fillGradientRectangleInPixels(int x, int y, int width, int height,
 	final int bitResolution = (depth >= 24) ? 8 : (depth >= 15) ? 5 : 0;
 	ImageData.fillGradientRectangle(this, data.device,
 		x, y, width, height, vertical, fromRGB, toRGB,
-		bitResolution, bitResolution, bitResolution);
+		bitResolution, bitResolution, bitResolution, zoom);
 }
 
 /**

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

@@ -1592,7 +1592,7 @@ public Menu getMenuBar () {
 @Override
 public Rectangle getBounds() {
 	checkDevice ();
-	return DPIUtil.autoScaleDown(getBoundsInPixels());
+	return DPIUtil.scaleDown(getBoundsInPixels(), DPIUtil.getDeviceZoom());
 }
 
 Rectangle getBoundsInPixels () {
@@ -1665,7 +1665,7 @@ int getClickCount (int type, int button, long hwnd, long lParam) {
 @Override
 public Rectangle getClientArea () {
 	checkDevice ();
-	return DPIUtil.autoScaleDown(getClientAreaInPixels());
+	return DPIUtil.scaleDown(getClientAreaInPixels(), DPIUtil.getDeviceZoom());
 }
 
 Rectangle getClientAreaInPixels () {