add support for zoom level of program images

Signed-off-by: Patrick Tief <[email protected]>

Author: ptief

bundles/org.eclipse.swt/Eclipse SWT Program/cocoa/org/eclipse/swt/program/Program.java

@@ -333,14 +333,29 @@ public boolean execute (String fileName) {
 	}
 }
 
+
 /**
- * Returns the receiver's image data.  This is the icon
- * that is associated with the receiver in the operating
- * system.
+ * Returns the receiver's image data at 100% zoom level.  
+ * This is the icon that is associated with the receiver 
+ * in the operating system.
  *
  * @return the image data for the program, may be null
  */
 public ImageData getImageData () {
+  return getImageData (100);
+}
+
+/**
+ * Returns the receiver's image data based on the given zoom level.  
+ * This is the icon that is associated with the receiver in the 
+ * operating system.
+ * 
+ * @param zoom
+ *            The zoom level in % of the standard resolution
+ * 
+ * @return the image data for the program, may be null
+ */
+public ImageData getImageData (int zoom) {
 	NSAutoreleasePool pool = (NSAutoreleasePool) new NSAutoreleasePool().alloc().init();
 	try {
 		NSWorkspace workspace = NSWorkspace.sharedWorkspace();
@@ -358,7 +373,7 @@ public ImageData getImageData () {
 				nsImage.setSize(size);
 				nsImage.retain();
 				Image image = Image.cocoa_new(Display.getCurrent(), SWT.BITMAP, nsImage);
-				ImageData imageData = image.getImageData();
+				ImageData imageData = image.getImageData(zoom);
 				image.dispose();
 				return imageData;
 			}

bundles/org.eclipse.swt/Eclipse SWT Program/gtk/org/eclipse/swt/program/Program.java

@@ -17,7 +17,6 @@
 import java.nio.file.*;
 import java.nio.file.Path;
 import java.util.*;
-import java.util.List;
 
 import org.eclipse.swt.*;
 import org.eclipse.swt.graphics.*;
@@ -121,13 +120,29 @@ public static Program findProgram(String extension) {
 }
 
 /**
- * Returns the receiver's image data.  This is the icon
- * that is associated with the receiver in the operating
- * system.
+ * Returns the receiver's image data at 100% zoom level.
+ * This is the icon that is associated with the receiver
+ * in the operating system.
  *
  * @return the image data for the program, may be null
  */
 public ImageData getImageData() {
+  return getImageData(100);
+}
+
+
+
+/**
+ * Returns the receiver's image data based on the given zoom level.
+ * This is the icon that is associated with the receiver in the
+ * operating system.
+ *
+ * @param zoom
+ *            The zoom level in % of the standard resolution
+ *
+ * @return the image data for the program, may be null
+ */
+public ImageData getImageData(int zoom) {
 	if (iconPath == null) return null;
 	ImageData data = null;
 

bundles/org.eclipse.swt/Eclipse SWT Program/win32/org/eclipse/swt/program/Program.java

@@ -353,52 +353,66 @@ public boolean execute (String fileName) {
 	return success;
 }
 
+
+
 /**
- * Returns the receiver's image data.  This is the icon
- * that is associated with the receiver in the operating
- * system.
+ * Returns the receiver's image data at 100% zoom level.
+ * This is the icon that is associated with the receiver
+ * in the operating system.
  *
  * @return the image data for the program, may be null
  */
 public ImageData getImageData () {
-	if (extension != null) {
-		SHFILEINFO shfi = new SHFILEINFO ();
-		int flags = OS.SHGFI_ICON | OS.SHGFI_SMALLICON | OS.SHGFI_USEFILEATTRIBUTES;
-		TCHAR pszPath = new TCHAR (0, extension, true);
-		OS.SHGetFileInfo (pszPath.chars, OS.FILE_ATTRIBUTE_NORMAL, shfi, SHFILEINFO.sizeof, flags);
-		if (shfi.hIcon != 0) {
-			Image image = Image.win32_new (null, SWT.ICON, shfi.hIcon);
-			/* Fetch the ImageData at 100% zoom and return */
-			ImageData imageData = image.getImageData ();
-			image.dispose ();
-			return imageData;
-		}
-	}
-	int nIconIndex = 0;
-	String fileName = iconName;
-	int index = iconName.indexOf (',');
-	if (index != -1) {
-		fileName = iconName.substring (0, index);
-		String iconIndex = iconName.substring (index + 1, iconName.length ()).trim ();
-		try {
-			nIconIndex = Integer.parseInt (iconIndex);
-		} catch (NumberFormatException e) {}
-	}
-	int length = fileName.length ();
-	if (length > 1 && fileName.charAt (0) == '\"') {
-		if (fileName.charAt (length - 1) == '\"') {
-			fileName = fileName.substring (1, length - 1);
-		}
-	}
-	TCHAR lpszFile = new TCHAR (0, fileName, true);
-	long [] phiconSmall = new long[1], phiconLarge = null;
-	OS.ExtractIconEx (lpszFile, nIconIndex, phiconLarge, phiconSmall, 1);
-	if (phiconSmall [0] == 0) return null;
-	Image image = Image.win32_new (null, SWT.ICON, phiconSmall [0]);
-	/* Fetch the ImageData at 100% zoom and return */
-	ImageData imageData = image.getImageData ();
-	image.dispose ();
-	return imageData;
+  return getImageData (100);
+}
+
+/**
+ * Returns the receiver's image data based on the given zoom level.
+ * This is the icon that is associated with the receiver in the
+ * operating system.
+ *
+ * @param zoom
+ *            The zoom level in % of the standard resolution
+ *
+ * @return the image data for the program, may be null
+ */
+public ImageData getImageData (int zoom) {
+  if (extension != null) {
+    SHFILEINFO shfi = new SHFILEINFO ();
+    int flags = OS.SHGFI_ICON | OS.SHGFI_SMALLICON | OS.SHGFI_USEFILEATTRIBUTES;
+    TCHAR pszPath = new TCHAR (0, extension, true);
+    OS.SHGetFileInfo (pszPath.chars, OS.FILE_ATTRIBUTE_NORMAL, shfi, SHFILEINFO.sizeof, flags);
+    if (shfi.hIcon != 0) {
+      Image image = Image.win32_new (null, SWT.ICON, shfi.hIcon);
+      ImageData imageData = image.getImageData (zoom);
+      image.dispose ();
+      return imageData;
+    }
+  }
+  int nIconIndex = 0;
+  String fileName = iconName;
+  int index = iconName.indexOf (',');
+  if (index != -1) {
+    fileName = iconName.substring (0, index);
+    String iconIndex = iconName.substring (index + 1, iconName.length ()).trim ();
+    try {
+      nIconIndex = Integer.parseInt (iconIndex);
+    } catch (NumberFormatException e) {}
+  }
+  int length = fileName.length ();
+  if (length > 1 && fileName.charAt (0) == '\"') {
+    if (fileName.charAt (length - 1) == '\"') {
+      fileName = fileName.substring (1, length - 1);
+    }
+  }
+  TCHAR lpszFile = new TCHAR (0, fileName, true);
+  long [] phiconSmall = new long[1], phiconLarge = null;
+  OS.ExtractIconEx (lpszFile, nIconIndex, phiconLarge, phiconSmall, 1);
+  if (phiconSmall [0] == 0) return null;
+  Image image = Image.win32_new (null, SWT.ICON, phiconSmall [0]);
+  ImageData imageData = image.getImageData (zoom);
+  image.dispose ();
+  return imageData;
 }
 
 /**