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

@@ -39,8 +39,6 @@
 import org.eclipse.swt.graphics.ImageData;
 import org.eclipse.swt.graphics.ImageDataProvider;
 import org.eclipse.swt.graphics.ImageFileNameProvider;
-import org.eclipse.swt.graphics.SVGRasterizer;
-import org.eclipse.swt.graphics.SVGRasterizerRegistry;
 
 /**
  * An ImageDescriptor that gets its information from a URL. This class is not
@@ -101,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;
@@ -168,15 +182,31 @@ private static ImageData getImageData(String url, int zoom) {
 		return null;
 	}
 
+	private static ImageData getCustomizedImageData(String url, int zoom, int flag) {
+		URL tempURL = getURL(url);
+		if (tempURL != null) {
+			try (InputStream in = getStream(tempURL)) {
+				return getImageData(tempURL, zoom, flag);
+			} catch (IOException e) {
+				// ignore.
+			}
+		}
+		return null;
+	}
+
 	private static ImageData getImageData(URL url) {
-		return getImageData(url, 0);
+		return getImageData(url, 0, SWT.IMAGE_COPY);
 	}
 
 	private static ImageData getImageData(URL url, int zoom) {
+		return getImageData(url, zoom, SWT.IMAGE_COPY);
+	}
+
+	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) {

bundles/org.eclipse.ui.workbench/META-INF/MANIFEST.MF

@@ -113,8 +113,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)",
  org.eclipse.e4.ui.workbench.addons.swt;bundle-version="0.10.0",
  org.eclipse.e4.ui.services;bundle-version="1.3.0",
  org.eclipse.emf.ecore.xmi;bundle-version="2.11.0",
- org.eclipse.e4.core.di.extensions;bundle-version="0.13.0",
- org.eclipse.swt.svg;bundle-version="1.0.0"
+ org.eclipse.e4.core.di.extensions;bundle-version="0.13.0"
 Import-Package: com.ibm.icu.util,
  jakarta.annotation;version="[2.1.0,3.0.0)",
  jakarta.inject;version="[2.0.0,3.0.0)",

bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/Workbench.java

@@ -156,7 +156,6 @@
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.graphics.Transform;
-import org.eclipse.swt.svg.JSVGRasterizer;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Listener;
 import org.eclipse.swt.widgets.Monitor;
@@ -568,7 +567,6 @@ public static Workbench getInstance() {
 	 */
 	public static int createAndRunWorkbench(final Display display, final WorkbenchAdvisor advisor) {
 		final int[] returnCode = new int[1];
-		JSVGRasterizer.intializeJSVGRasterizer();
 		Realm.runWithDefault(DisplayRealm.getRealm(display), () -> {
 			boolean showProgress = PrefUtil.getAPIPreferenceStore()
 					.getBoolean(IWorkbenchPreferenceConstants.SHOW_PROGRESS_ON_STARTUP);