Cursors in GEF uses Image instead of ImageData

This is required for the cursor images to be scaled appropriately
according to the given zoom

Author: arunjose696

org.eclipse.gef/src/org/eclipse/gef/SharedCursors.java

@@ -12,7 +12,12 @@
  *******************************************************************************/
 package org.eclipse.gef;
 
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+
 import org.eclipse.swt.graphics.Cursor;
+import org.eclipse.swt.graphics.Device;
+import org.eclipse.swt.graphics.ImageDataProvider;
 
 import org.eclipse.jface.resource.ImageDescriptor;
 
@@ -45,15 +50,24 @@ public class SharedCursors extends Cursors {
 	public static final Cursor CURSOR_TREE_MOVE;
 
 	static {
-		CURSOR_PLUG = createCursor("icons/plug-cursor.png"); //$NON-NLS-1$
-		CURSOR_PLUG_NOT = createCursor("icons/plugnot-cursor.png"); //$NON-NLS-1$
-		CURSOR_TREE_ADD = createCursor("icons/tree_add-cursor.png"); //$NON-NLS-1$
-		CURSOR_TREE_MOVE = createCursor("icons/tree_move-cursor.png"); //$NON-NLS-1$
+		CURSOR_PLUG = createCursor("icons/plug-cursor.svg"); //$NON-NLS-1$
+		CURSOR_PLUG_NOT = createCursor("icons/plugnot-cursor.svg"); //$NON-NLS-1$
+		CURSOR_TREE_ADD = createCursor("icons/tree_add-cursor.svg"); //$NON-NLS-1$
+		CURSOR_TREE_MOVE = createCursor("icons/tree_move-cursor.svg"); //$NON-NLS-1$
 	}
 
 	private static Cursor createCursor(String sourceName) {
 		ImageDescriptor src = InternalImages.createDescriptor(sourceName);
-		return new Cursor(null, src.getImageData(100), 0, 0);
+		try {
+			Constructor<Cursor> ctor = Cursor.class.getConstructor(Device.class, ImageDataProvider.class, int.class,
+					int.class);
+			return ctor.newInstance(null, (ImageDataProvider) src::getImageData, 0, 0);
+		} catch (NoSuchMethodException e) {
+			// SWT version < 3.131.0 (no ImageDataProvider-based constructor)
+			return new Cursor(null, src.getImageData(100), 0, 0); // older constructor
+		} catch (InstantiationException | IllegalAccessException | InvocationTargetException e) {
+			throw new RuntimeException("Failed to instantiate Cursor", e); //$NON-NLS-1$
+		}
 	}
 
 }

org.eclipse.gef/src/org/eclipse/gef/ui/palette/FlyoutPaletteComposite.java

@@ -13,6 +13,8 @@
 package org.eclipse.gef.ui.palette;
 
 import java.beans.PropertyChangeSupport;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.function.BiConsumer;
@@ -32,9 +34,10 @@
 import org.eclipse.swt.events.MouseTrackAdapter;
 import org.eclipse.swt.events.MouseTrackListener;
 import org.eclipse.swt.graphics.Cursor;
+import org.eclipse.swt.graphics.Device;
 import org.eclipse.swt.graphics.Font;
 import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.ImageData;
+import org.eclipse.swt.graphics.ImageDataProvider;
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.widgets.Canvas;
@@ -88,7 +91,6 @@
 import org.eclipse.gef.GraphicalViewer;
 import org.eclipse.gef.dnd.TemplateTransfer;
 import org.eclipse.gef.internal.GEFMessages;
-import org.eclipse.gef.internal.InternalGEFPlugin;
 import org.eclipse.gef.internal.InternalImages;
 import org.eclipse.gef.ui.views.palette.PaletteView;
 
@@ -1608,13 +1610,19 @@ public static Cursor getCursor(int code) {
 		 */
 		private static Cursor createCursor(String sourceName) {
 			ImageDescriptor source = PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(sourceName);
-			int deviceZoom = InternalGEFPlugin.getOrDefaultDeviceZoom();
-			// Scales the image if the display is using neither 100% nor 200% zoom
-			ImageData sourceData = InternalGEFPlugin.scaledImageData(source, deviceZoom);
 			// Hotspot should be the center of the image. e.g. (16, 16) on 100% zoom
-			int hotspotX = sourceData.width / 2;
-			int hotspotY = sourceData.height / 2;
-			return new Cursor(null, sourceData, hotspotX, hotspotY);
+			int hotspotX = source.getImageData(100).width / 2;
+			int hotspotY = source.getImageData(100).height / 2;
+			try {
+				Constructor<Cursor> ctor = Cursor.class.getConstructor(Device.class, ImageDataProvider.class, int.class,
+						int.class);
+				return ctor.newInstance(null, (ImageDataProvider) source::getImageData, hotspotX, hotspotY);
+			} catch (NoSuchMethodException e) {
+				// SWT version < 3.131.0 (no ImageDataProvider-based constructor)
+				return new Cursor(null, source.getImageData(100), hotspotX, hotspotY); // older constructor
+			} catch (InstantiationException | IllegalAccessException | InvocationTargetException e) {
+				throw new RuntimeException("Failed to instantiate Cursor", e); //$NON-NLS-1$
+			}
 		}
 	}
 }