diff options
| author | Eric Williams | 2019-10-28 18:13:09 +0000 |
|---|---|---|
| committer | Eric Williams | 2019-10-29 14:56:40 +0000 |
| commit | 049ef11cbbb59d85197809bada18506a5b1ae0fe (patch) | |
| tree | d06bae983fdb1b1bee789dc0a023db5d49654717 /bundles | |
| parent | 24d2f07252fd9911aadd274cc7735d961cee73fd (diff) | |
| download | eclipse.platform.swt-049ef11cbbb59d85197809bada18506a5b1ae0fe.tar.gz eclipse.platform.swt-049ef11cbbb59d85197809bada18506a5b1ae0fe.tar.xz eclipse.platform.swt-049ef11cbbb59d85197809bada18506a5b1ae0fe.zip | |
Bug 545804: [GTK] Add support for SVG files
Implement support on GTK side.
Tested using the snippet attached on GTK 3.24 and Fedora 30.
No AllNonBrowser JUnit tests fail.
Change-Id: I1e35b08fc931634e36f4881fd209b8a0ddf28138
Signed-off-by: Eric Williams <ericwill@redhat.com>
Diffstat (limited to 'bundles')
6 files changed, 19 insertions, 3 deletions
diff --git a/bundles/org.eclipse.swt/.settings/.api_filters b/bundles/org.eclipse.swt/.settings/.api_filters index 3da34e65c1..fa464b814c 100644 --- a/bundles/org.eclipse.swt/.settings/.api_filters +++ b/bundles/org.eclipse.swt/.settings/.api_filters @@ -269,6 +269,12 @@ <message_argument value="COLOR_WIDGET_DISABLED_FOREGROUND"/> </message_arguments> </filter> + <filter id="336658481"> + <message_arguments> + <message_argument value="org.eclipse.swt.SWT"/> + <message_argument value="IMAGE_SVG"/> + </message_arguments> + </filter> </resource> <resource path="Eclipse SWT/common/org/eclipse/swt/events/ArmListener.java" type="org.eclipse.swt.events.ArmListener"> <filter id="576720909"> diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/SWT.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/SWT.java index d18b020230..5629185a5c 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/SWT.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/SWT.java @@ -4238,6 +4238,14 @@ public class SWT { public static final int IMAGE_OS2_BMP = 7; /** + * Image format constant indicating a SVG format image (value is 8). + * <br>Note that this is a <em>HINT</em> and is currently only supported on GTK. + * + * @since 3.113 + */ + public static final int IMAGE_SVG = 8; + + /** * GIF image disposal method constants indicating that the * disposal method is unspecified (value is 0). */ diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/ImageLoader.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/ImageLoader.java index df04ea1642..a1f6489dcc 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/ImageLoader.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/ImageLoader.java @@ -343,6 +343,7 @@ int getImageFormat(long loader) { case "ico": return SWT.IMAGE_ICO; case "jpeg": return SWT.IMAGE_JPEG; case "png": return SWT.IMAGE_PNG; + case "svg": return SWT.IMAGE_SVG; default: return SWT.IMAGE_UNDEFINED; } } @@ -547,6 +548,7 @@ public void save(OutputStream stream, int format) { case SWT.IMAGE_JPEG: typeStr = "jpeg"; break; case SWT.IMAGE_PNG: typeStr = "png"; break; case SWT.IMAGE_TIFF: typeStr = "tiff"; break; + case SWT.IMAGE_SVG: typeStr = "svg"; break; } byte [] type = Converter.wcsToMbcs(typeStr, true); diff --git a/bundles/org.eclipse.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.swt/META-INF/MANIFEST.MF index 12643d1e86..cf3132130d 100644 --- a/bundles/org.eclipse.swt/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.swt/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-SymbolicName: org.eclipse.swt; singleton:=true -Bundle-Version: 3.112.100.qualifier +Bundle-Version: 3.113.0.qualifier Bundle-ManifestVersion: 2 Bundle-Localization: plugin DynamicImport-Package: org.eclipse.swt.accessibility2 diff --git a/bundles/org.eclipse.swt/build.xml b/bundles/org.eclipse.swt/build.xml index e97f811149..a1794df148 100644 --- a/bundles/org.eclipse.swt/build.xml +++ b/bundles/org.eclipse.swt/build.xml @@ -18,7 +18,7 @@ <target name="init"> <property name="plugin" value="org.eclipse.swt" /> - <property name="version.suffix" value="3.112.100" /> + <property name="version.suffix" value="3.113.0" /> <property name="full.name" value="${plugin}_${version.suffix}" /> <property name="temp.folder" value="${basedir}/temp.folder" /> <property name="plugin.destination" value="${basedir}" /> diff --git a/bundles/org.eclipse.swt/pom.xml b/bundles/org.eclipse.swt/pom.xml index e22dc477e9..5d2399637b 100644 --- a/bundles/org.eclipse.swt/pom.xml +++ b/bundles/org.eclipse.swt/pom.xml @@ -19,7 +19,7 @@ </parent> <groupId>org.eclipse.swt</groupId> <artifactId>org.eclipse.swt</artifactId> - <version>3.112.100-SNAPSHOT</version> + <version>3.113.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <properties> |