Replace nativeZoom of control with disabled autoscaling with 100

The nativeZoom of some controls currently always has the original native
zoom value, even if autoscaling is disabled for that control such that
they behave as if their native zoom is effectively 100. With this change
the behavior of those control will be fixed as per autoscale disabled
value.

Author: ShahzaibIbrahim

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

@@ -78,11 +78,14 @@ public abstract class Control extends Widget implements Drawable {
 	Region region;
 	Font font;
 	int drawCount, foreground, background, backgroundAlpha = 255;
+	boolean autoScaleDisabled = false;
 
 	/** Cache for currently processed DPI change event to be able to cancel it if a new one is triggered */
 	Event currentDpiChangeEvent;
 
 	private static final String DATA_SHELL_ZOOM = "SHELL_ZOOM";
+
+	private static final String DATA_AUTOSCALE_DISABLED = "AUTOSCALE_DISABLED";
 /**
  * Prevents uninitialized instances from being created outside the package.
  */
@@ -122,6 +125,7 @@ public abstract class Control extends Widget implements Drawable {
 public Control (Composite parent, int style) {
 	super (parent, style);
 	this.parent = parent;
+	this.autoScaleDisabled = parent.autoScaleDisabled;
 	createWidget ();
 }
 
@@ -1283,6 +1287,19 @@ public Object getData(String key) {
 	return super.getData(key);
 }
 
+@Override
+public void setData(String key, Object value) {
+	super.setData(key, value);
+	if (DATA_AUTOSCALE_DISABLED.equals(key)) {
+		autoScaleDisabled = Boolean.parseBoolean(value.toString());
+		if (autoScaleDisabled) {
+			this.nativeZoom = 100;
+		} else {
+			this.nativeZoom = (int) getData(DATA_SHELL_ZOOM);
+		}
+	}
+}
+
 /**
  * Returns <code>true</code> if the receiver is detecting
  * drag gestures, and  <code>false</code> otherwise.
@@ -3547,7 +3564,7 @@ public void setLayoutData (Object layoutData) {
  */
 public void setLocation (int x, int y) {
 	checkWidget ();
-	int zoom = getZoom();
+	int zoom = autoScaleDisabled ? parent.getZoom() : getZoom();
 	x = DPIUtil.pointToPixel(x, zoom);
 	y = DPIUtil.pointToPixel(y, zoom);
 	setLocationInPixels(x, y);
@@ -3804,7 +3821,7 @@ public void setRegion (Region region) {
  */
 public void setSize (int width, int height) {
 	checkWidget ();
-	int zoom = getZoom();
+	int zoom = autoScaleDisabled ? parent.getZoom() : getZoom();
 	width = DPIUtil.pointToPixel(width, zoom);
 	height = DPIUtil.pointToPixel(height, zoom);
 	setSizeInPixels(width, height);
@@ -4798,6 +4815,23 @@ public boolean setParent (Composite parent) {
 	return true;
 }
 
+@Override
+GC createNewGC(long hDC, GCData data) {
+	data.nativeZoom = getNativeZoom();
+	if (autoScaleDisabled && data.font != null) {
+		data.font = SWTFontProvider.getFont(display, data.font.getFontData()[0], 100);
+	}
+	return GC.win32_new(hDC, data);
+}
+
+@Override
+int getZoom() {
+	if (autoScaleDisabled) {
+		return 100;
+	}
+	return super.getZoom();
+}
+
 abstract TCHAR windowClass ();
 
 abstract long windowProc ();
@@ -5972,6 +6006,9 @@ void sendZoomChangedEvent(Event event, Shell shell) {
 @Override
 void handleDPIChange(Event event, float scalingFactor) {
 	super.handleDPIChange(event, scalingFactor);
+	if (this.autoScaleDisabled) {
+		this.nativeZoom = 100;
+	}
 	resizeFont(this, getNativeZoom());
 
 	Image image = backgroundImage;

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

@@ -65,7 +65,6 @@ public abstract class Widget {
 	 * @noreference This field is not intended to be referenced by clients.
 	 */
 	public int nativeZoom;
-	boolean autoScaleDisabled = false;
 	int style, state;
 	Display display;
 	EventTable eventTable;
@@ -133,8 +132,6 @@ public abstract class Widget {
 	/* Bidi flag and for auto text direction */
 	static final int AUTO_TEXT_DIRECTION = SWT.LEFT_TO_RIGHT | SWT.RIGHT_TO_LEFT;
 
-	private static final String DATA_AUTOSCALE_DISABLED = "AUTOSCALE_DISABLED";
-
 	/* Initialize the Common Controls DLL */
 	static {
 		INITCOMMONCONTROLSEX icce = new INITCOMMONCONTROLSEX ();
@@ -184,7 +181,6 @@ public Widget (Widget parent, int style) {
 	checkParent (parent);
 	this.style = style;
 	this.nativeZoom = parent != null ? parent.nativeZoom : DPIUtil.getNativeDeviceZoom();
-	this.autoScaleDisabled = parent.autoScaleDisabled;
 	display = parent.display;
 	reskinWidget ();
 	notifyCreationTracker();
@@ -1470,10 +1466,6 @@ public void setData (String key, Object value) {
 		}
 	}
 	if (key.equals(SWT.SKIN_CLASS) || key.equals(SWT.SKIN_ID)) this.reskin(SWT.ALL);
-
-	if (DATA_AUTOSCALE_DISABLED.equals(key)) {
-		autoScaleDisabled = Boolean.parseBoolean(value.toString());
-	}
 }
 
 boolean sendFocusEvent (int type) {
@@ -2704,23 +2696,14 @@ void notifyDisposalTracker() {
 
 GC createNewGC(long hDC, GCData data) {
 	data.nativeZoom = getNativeZoom();
-	if (autoScaleDisabled && data.font != null) {
-		data.font = SWTFontProvider.getFont(display, data.font.getFontData()[0], 100);
-	}
 	return GC.win32_new(hDC, data);
 }
 
 int getNativeZoom() {
-	if (autoScaleDisabled) {
-		return 100;
-	}
 	return nativeZoom;
 }
 
 int getZoom() {
-	if (autoScaleDisabled) {
-		return 100;
-	}
 	return DPIUtil.getZoomForAutoscaleProperty(nativeZoom);
 }