disabled icon logic

disabled icon logic

Author: Michael5601

binaries/org.eclipse.swt.win32.win32.x86_64/META-INF/MANIFEST.MF

@@ -3,7 +3,7 @@ Fragment-Host: org.eclipse.swt;bundle-version="[3.128.0,4.0.0)"
 Bundle-Name: %fragmentName
 Bundle-Vendor: %providerName
 Bundle-SymbolicName: org.eclipse.swt.win32.win32.x86_64; singleton:=true
-Bundle-Version: 3.130.0.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-ManifestVersion: 2
 Bundle-Localization: fragment
 Export-Package: 

bundles/org.eclipse.swt.svg.tests/JUnit Tests/org/eclipse/swt/svg/tests/junit/Test_org_eclipse_swt_internal_SVGRasterizer.java

@@ -38,7 +38,7 @@ public class Test_org_eclipse_swt_internal_SVGRasterizer {
 
 	ImageDataProvider imageDataProvider = zoom -> {
 		String fileName = "collapseall.svg";
-		return new ImageData(getPath(fileName), zoom);
+		return new ImageData(getPath(fileName), zoom, SWT.IMAGE_COPY);
 	};
 
 	@Before
@@ -89,7 +89,7 @@ public void test_ConstructorLorg_eclipse_swt_graphics_Device_ImageDataProvider()
 		// Corrupt Image provider
 		ImageDataProvider provider = zoom -> {
 			String fileName = "corrupt.svg";
-			return new ImageData(getPath(fileName), zoom);
+			return new ImageData(getPath(fileName), zoom, SWT.IMAGE_COPY);
 		};
 		try {
 			image = new Image(display, provider);

bundles/org.eclipse.swt.svg/META-INF/services/org.eclipse.swt.graphics.SVGRasterizer

@@ -0,0 +1 @@
+org.eclipse.swt.svg.JSVGRasterizer

bundles/org.eclipse.swt.svg/src/org/eclipse/swt/svg/JSVGRasterizer.java

@@ -42,7 +42,19 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.ImageData;
 import org.eclipse.swt.graphics.PaletteData;
+import org.eclipse.swt.graphics.RGB;
 import org.eclipse.swt.internal.image.SVGRasterizer;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.xml.sax.SAXException;
 
 import com.github.weisj.jsvg.SVGDocument;
 import com.github.weisj.jsvg.geometry.size.FloatSize;
@@ -73,7 +85,19 @@ public class JSVGRasterizer implements SVGRasterizer {
 	);
 
 	@Override
-	public ImageData[] rasterizeSVG(InputStream inputStream, int zoom) throws IOException {
+	public ImageData[] rasterizeSVG(InputStream inputStream, int zoom, int flag) throws IOException {
+		switch(flag) {
+			case SWT.IMAGE_DISABLE:
+				inputStream = applyDisabledLook(inputStream);
+				break;
+			case SWT.IMAGE_GRAY:
+				inputStream = applyGrayLook(inputStream);
+				break;
+			case SWT.IMAGE_COPY:
+				break;
+			default:
+				SWT.error(SWT.ERROR_INVALID_IMAGE);
+		}
 		SVGDocument svgDocument = loadSVG(inputStream);
 		if (svgDocument != null) {
 			return generateRasterizedImageData(svgDocument, zoom);
@@ -141,4 +165,80 @@ private ImageData[] convertToSWTImageData(BufferedImage rasterizedImage) {
 		}
         return new ImageData[]{imageData};
 	}
+
+	private static InputStream applyDisabledLook(InputStream svgInputStream) throws IOException {
+		Document svgDocument = parseSVG(svgInputStream);
+		addDisabledFilter(svgDocument);
+		try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream()) {
+			writeSVG(svgDocument, outputStream);
+			return new ByteArrayInputStream(outputStream.toByteArray());
+		}
+	}
+	
+	private static InputStream applyGrayLook(InputStream svgInputStream) throws IOException {
+		Document svgDocument = parseSVG(svgInputStream);
+		addGrayFilter(svgDocument);
+		try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream()) {
+			writeSVG(svgDocument, outputStream);
+			return new ByteArrayInputStream(outputStream.toByteArray());
+		}
+	}
+
+	private static Document parseSVG(InputStream inputStream) throws IOException {
+		DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+		DocumentBuilder builder;
+		try {
+			builder = factory.newDocumentBuilder();
+			return builder.parse(inputStream);
+		} catch (SAXException | IOException | ParserConfigurationException e) {
+			throw new IOException(e.getMessage());
+		}
+	}
+
+	private static void addDisabledFilter(Document document) {
+		addFilter(document, 0.64f, 0.4f);
+	}
+	
+	private static void addGrayFilter(Document document) {
+		addFilter(document, 0.64f, 0.1f);
+	}
+
+	private static void addFilter(Document document, float slope, float intercept) {
+		Element defs = (Element) document.getElementsByTagName("defs").item(0);
+		if (defs == null) {
+			defs = document.createElement("defs");
+			document.getDocumentElement().appendChild(defs);
+		}
+
+		Element filter = document.createElement("filter");
+		filter.setAttribute("id", "customizedLook");
+
+		Element colorMatrix = document.createElement("feColorMatrix");
+		colorMatrix.setAttribute("type", "saturate");
+		colorMatrix.setAttribute("values", "0");
+		filter.appendChild(colorMatrix);
+
+		Element componentTransfer = document.createElement("feComponentTransfer");
+		for (String channel : new String[] { "R", "G", "B" }) {
+			Element func = document.createElement("feFunc" + channel);
+			func.setAttribute("type", "linear");
+			func.setAttribute("slope", Float.toString(slope));
+			func.setAttribute("intercept", Float.toString(intercept));
+			componentTransfer.appendChild(func);
+		}
+		filter.appendChild(componentTransfer);
+		defs.appendChild(filter);
+		document.getDocumentElement().setAttribute("filter", "url(#customizedLook)");
+	}
+
+	private static void writeSVG(Document document, OutputStream outputStream) throws IOException {
+		TransformerFactory transformerFactory = TransformerFactory.newInstance();
+		Transformer transformer;
+		try {
+			transformer = transformerFactory.newTransformer();
+			transformer.transform(new DOMSource(document), new StreamResult(outputStream));
+		} catch (TransformerException e) {
+			throw new IOException(e.getMessage());
+		}
+	}
 }

bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/ImageDataLoader.java

@@ -48,9 +48,4 @@ public static ElementAtZoom<ImageData> load(String filename, int fileZoom, int t
 		if (data.isEmpty()) SWT.error(SWT.ERROR_INVALID_IMAGE);
 		return data.get(0);
 	}
-
-	public static ImageData[] load(String filename, int zoom) {
-		return new ImageLoader().load(filename, zoom);
-	}
-
 }

bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/ImageDataProvider.java

@@ -43,4 +43,17 @@ public interface ImageDataProvider {
 	 */
 	ImageData getImageData (int zoom);
 
+	/**
+	* @since 4.0
+	*/
+	default ImageData getCustomizedImageData(int zoom, int flag) {
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	* @since 4.0
+	*/
+	default boolean supportsRasterizationFlag(int flag) {
+		return false;
+	}
 }

bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/ImageLoader.java

@@ -162,6 +162,7 @@ List<ElementAtZoom<ImageData>> load(InputStream stream, int fileZoom, int target
 	return images;
 }
 
+//TODO: JavaDocs flag parameter
 /**
  * Loads an array of <code>ImageData</code> objects from the
  * file with the specified name. Throws an error if either

bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/SVGRasterizer.java

@@ -32,5 +32,5 @@ public interface SVGRasterizer {
 	 *         the input is not a valid SVG file or cannot be processed.
 	 * @throws IOException if an error occurs while reading the SVG data.
 	 */
-	public ImageData[] rasterizeSVG(InputStream stream, int zoom) throws IOException;
+	public ImageData[] rasterizeSVG(InputStream stream, int zoom, int flag) throws IOException;
 }

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

@@ -239,6 +239,9 @@ public Image(Device device, Image srcImage, int flag) {
 	long srcImageHandle = win32_getHandle(srcImage, getZoom());
 	switch (flag) {
 		case SWT.IMAGE_COPY: {
+			if(createWithSVG(device, flag)) {
+				break;
+			}
 			switch (type) {
 				case SWT.BITMAP:
 					/* Get the HDC for the device */
@@ -274,12 +277,18 @@ public Image(Device device, Image srcImage, int flag) {
 			break;
 		}
 		case SWT.IMAGE_DISABLE: {
+			if(createWithSVG(device, flag)) {
+				break;
+			}
 			ImageData data = srcImage.getImageData(srcImage.getZoom());
 			ImageData newData = applyDisableImageData(data, rect.height, rect.width);
 			init (newData, getZoom());
 			break;
 		}
 		case SWT.IMAGE_GRAY: {
+			if(createWithSVG(device, flag)) {
+				break;
+			}
 			ImageData data = srcImage.getImageData(srcImage.getZoom());
 			ImageData newData = applyGrayImageData(data, rect.height, rect.width);
 			init (newData, getZoom());
@@ -292,6 +301,28 @@ public Image(Device device, Image srcImage, int flag) {
 	this.device.registerResourceWithZoomSupport(this);
 }
 
+private boolean createWithSVG(Device device, int flag) {
+	ImageData data = null;
+	Image customizedImage = null;
+	if (imageProvider.getProvider() instanceof ImageFileNameProvider imageFileNameProvider) {
+		ElementAtZoom<String> fileName = DPIUtil.validateAndGetImagePathAtZoom(imageFileNameProvider, getZoom());
+		if (fileName.element().endsWith(".svg")) {
+			customizedImage = new Image(device, imageFileNameProvider, flag);
+		}
+	} else if (imageProvider.getProvider() instanceof ImageDataProvider imageDataProvider) {
+		if (imageDataProvider.supportsRasterizationFlag(flag)) {
+			customizedImage = new Image(device, imageDataProvider, flag);
+		}
+	}
+	if(customizedImage != null) {
+		data = customizedImage.getImageData(customizedImage.getZoom());
+		init(data, getZoom());
+		customizedImage.dispose();
+		return true;
+	}
+	return false;
+}
+
 /**
  * Constructs an empty instance of this class with the
  * width and height of the specified rectangle. The result
@@ -561,6 +592,20 @@ public Image(Device device, ImageFileNameProvider imageFileNameProvider) {
 	this.device.registerResourceWithZoomSupport(this);
 }
 
+private Image(Device device, ImageFileNameProvider imageFileNameProvider, int flag) {
+	super(device);
+	this.imageProvider = new ImageFileNameProviderWrapper(imageFileNameProvider);
+	initialNativeZoom = DPIUtil.getNativeDeviceZoom();
+	int zoom = getZoom();
+	ElementAtZoom<String> fileName = DPIUtil.validateAndGetImagePathAtZoom (imageFileNameProvider, zoom);
+	ImageHandle imageMetadata = initNative (fileName.element(), zoom);
+	if (imageMetadata == null) {
+		init(new ImageData (fileName.element(), zoom, flag), zoom);
+	}
+	init();
+	this.device.registerResourceWithZoomSupport(this);
+}
+
 /**
  * Constructs an instance of this class by loading its representation
  * from the ImageData retrieved from the ImageDataProvider. Throws an
@@ -599,6 +644,16 @@ public Image(Device device, ImageDataProvider imageDataProvider) {
 	this.device.registerResourceWithZoomSupport(this);
 }
 
+private Image(Device device, ImageDataProvider imageDataProvider, int flag) {
+	super(device);
+	this.imageProvider = new ImageDataProviderWrapper(imageDataProvider);
+	initialNativeZoom = DPIUtil.getNativeDeviceZoom();
+	ImageData data = imageDataProvider.getCustomizedImageData(getZoom(), flag);
+	init (data, getZoom());
+	init();
+	this.device.registerResourceWithZoomSupport(this);
+}
+
 /**
  * The provided ImageGcDrawer will be called on demand whenever a new variant of the
  * Image for an additional zoom is required. Depending on the OS-specific implementation