Do not use DPIUtil.getNativeDeviceZoom() to get the cursor handle #2057

Pass the native zoom to Cursor.win32_getHandle(Cursor, int) instead

Fixes #2057

Author: fedejeanne

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

@@ -355,13 +355,12 @@ public Cursor(Device device, ImageData source, int hotspotX, int hotspotY) {
  * Get the handle for a cursor given a zoom level.
  *
  * @param cursor the cursor
+ * @param zoom zoom level (in %) of the monitor the cursor is currently in.
  * @return The handle of the cursor.
  *
  * @noreference This method is not intended to be referenced by clients.
  */
-public static Long win32_getHandle (Cursor cursor) {
-	// The size of the cursor should match the zoom of the current monitor
-	int zoom = DPIUtil.getNativeDeviceZoom();
+public static Long win32_getHandle (Cursor cursor, int zoom) {
 	if (cursor.isDisposed()) {
 		return cursor.handle;
 	}

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

@@ -5475,7 +5475,7 @@ LRESULT WM_SETCURSOR (long wParam, long lParam) {
 		if (control == null) return null;
 		Cursor cursor = control.findCursor ();
 		if (cursor != null) {
-			OS.SetCursor (Cursor.win32_getHandle(cursor));
+			OS.SetCursor (Cursor.win32_getHandle(cursor, getNativeZoom()));
 			return LRESULT.ONE;
 		}
 	}

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

@@ -2659,7 +2659,7 @@ LRESULT WM_SETCURSOR (long wParam, long lParam) {
 				RECT rect = new RECT ();
 				OS.GetClientRect (handle, rect);
 				if (OS.PtInRect (rect, pt)) {
-					OS.SetCursor (Cursor.win32_getHandle(cursor));
+					OS.SetCursor (Cursor.win32_getHandle(cursor, getNativeZoom()));
 					switch (msg) {
 						case OS.WM_LBUTTONDOWN:
 						case OS.WM_RBUTTONDOWN:

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

@@ -823,7 +823,7 @@ public void setCursor(Cursor newCursor) {
 	checkWidget();
 	clientCursor = newCursor;
 	if (newCursor != null) {
-		if (inEvent) OS.SetCursor (Cursor.win32_getHandle(clientCursor));
+		if (inEvent) OS.SetCursor (Cursor.win32_getHandle(clientCursor, getNativeZoom()));
 	}
 }
 
@@ -892,7 +892,7 @@ long transparentProc (long hwnd, long msg, long wParam, long lParam) {
 			break;
 		case OS.WM_SETCURSOR:
 			if (clientCursor != null) {
-				OS.SetCursor (Cursor.win32_getHandle(clientCursor));
+				OS.SetCursor (Cursor.win32_getHandle(clientCursor, getNativeZoom()));
 				return 1;
 			}
 			if (resizeCursor != 0) {

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

@@ -4663,7 +4663,7 @@ void setCursor () {
 	* is IDC_ARROW.
 	*/
 	Cursor cursor = findCursor ();
-	long hCursor = cursor == null ? OS.LoadCursor (0, OS.IDC_ARROW) : Cursor.win32_getHandle(cursor);
+	long hCursor = cursor == null ? OS.LoadCursor (0, OS.IDC_ARROW) : Cursor.win32_getHandle(cursor, getNativeZoom());
 	OS.SetCursor (hCursor);
 }