disabled icon logic

Author: Michael5601

bundles/org.eclipse.jface/src/org/eclipse/jface/resource/FileImageDescriptor.java

@@ -126,7 +126,7 @@ public ImageData getImageData(int zoom) {
 		InputStream in = getStream(zoom);
 		if (in != null) {
 			try (BufferedInputStream stream = new BufferedInputStream(in)) {
-				return new ImageData(stream, zoom);
+				return new ImageData(stream, zoom, SWT.IMAGE_COPY);
 			} catch (SWTException e) {
 				if (e.code != SWT.ERROR_INVALID_IMAGE) {
 					throw e;

bundles/org.eclipse.jface/src/org/eclipse/jface/resource/URLImageDescriptor.java

@@ -99,6 +99,22 @@ public ImageData getImageData(int zoom) {
 			return URLImageDescriptor.getImageData(url, zoom);
 		}
 
+		@Override
+		public ImageData getCustomizedImageData(int zoom, int flag) {
+			return URLImageDescriptor.getCustomizedImageData(url, zoom, flag);
+		}
+
+		@Override
+		public boolean supportsRasterizationFlag(int flag) {
+			boolean supportsFlag = flag == SWT.IMAGE_DISABLE || flag == SWT.IMAGE_GRAY || flag == SWT.IMAGE_COPY;
+			URL tempURL = getURL(url);
+			if (tempURL != null) {
+				if (tempURL.toString().endsWith(".svg") && supportsFlag) { //$NON-NLS-1$
+					return true;
+				}
+			}
+			return false;
+		}
 	}
 
 	private static long cumulativeTime;
@@ -143,14 +159,14 @@ private static ImageData getImageData(String url, int zoom) {
 		URL tempURL = getURL(url);
 		if (tempURL != null) {
 			if (tempURL.toString().endsWith(".svg")) { //$NON-NLS-1$
-				return getImageData(tempURL, zoom);
+				return getImageData(tempURL, zoom, SWT.IMAGE_COPY);
 			}
 			if (zoom == 100) {
-				return getImageData(tempURL, zoom);
+				return getImageData(tempURL);
 			}
 			URL xUrl = getxURL(tempURL, zoom);
 			if (xUrl != null) {
-				ImageData xdata = getImageData(xUrl, zoom);
+				ImageData xdata = getImageData(xUrl);
 				if (xdata != null) {
 					return xdata;
 				}
@@ -159,22 +175,35 @@ private static ImageData getImageData(String url, int zoom) {
 			if (xpath != null) {
 				URL xPathUrl = getURL(xpath);
 				if (xPathUrl != null) {
-					return getImageData(xPathUrl, zoom);
+					return getImageData(xPathUrl);
 				}
 			}
 		}
 		return null;
 	}
 
 	private static ImageData getImageData(URL url) {
-		return getImageData(url, 0);
+		ImageData result = null;
+		try (InputStream in = getStream(url)) {
+			if (in != null) {
+				result = new ImageData(in);
+			}
+		} catch (SWTException e) {
+			if (e.code != SWT.ERROR_INVALID_IMAGE) {
+				throw e;
+				// fall through otherwise
+			}
+		} catch (IOException e) {
+			Policy.getLog().log(new Status(IStatus.ERROR, Policy.JFACE, e.getLocalizedMessage(), e));
+		}
+		return result;
 	}
 
-	private static ImageData getImageData(URL url, int zoom) {
+	private static ImageData getImageData(URL url, int zoom, int flag) {
 		ImageData result = null;
 		try (InputStream in = getStream(url)) {
 			if (in != null) {
-				result = new ImageData(in, zoom);
+				result = new ImageData(in, zoom, flag);
 			}
 		} catch (SWTException e) {
 			if (e.code != SWT.ERROR_INVALID_IMAGE) {
@@ -187,6 +216,11 @@ private static ImageData getImageData(URL url, int zoom) {
 		return result;
 	}
 
+	private static ImageData getCustomizedImageData(String url, int zoom, int flag) {
+		URL tempURL = getURL(url);
+		return getImageData(tempURL, zoom, flag);
+	}
+
 	/**
 	 * Returns a stream on the image contents. Returns null if a stream could
 	 * not be opened.