Merge branch 'eclipse-platform:master' into master

Author: IamLRBA

.mvn/extensions.xml

@@ -3,6 +3,6 @@
 	<extension>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho-build</artifactId>
-		<version>4.0.10</version>
+		<version>4.0.12</version>
 	</extension>
 </extensions>

bundles/org.eclipse.e4.ui.workbench.renderers.swt/icons/full/elcl16/view_menu.png

@@ -149,10 +149,17 @@ void setResourceUtils(IResourceUtilities<ImageDescriptor> utils) {
 	}
 
 	protected Image getImage(String iconURI, LocalResourceManager resourceManager) {
+		return createImage(iconURI, resourceManager, false);
+	}
+
+	private Image createImage(String iconURI, LocalResourceManager resourceManager, boolean disabled) {
 		Image image = null;
 
 		if (iconURI != null && iconURI.length() > 0) {
 			ImageDescriptor iconDescriptor = resUtils.imageDescriptorFromURI(URI.createURI(iconURI));
+			if (disabled) {
+				iconDescriptor = ImageDescriptor.createWithFlags(iconDescriptor, SWT.IMAGE_DISABLE);
+			}
 			if (iconDescriptor != null) {
 				try {
 					image = resourceManager.create(iconDescriptor);
@@ -169,6 +176,10 @@ protected Image getImage(String iconURI, LocalResourceManager resourceManager) {
 		return image;
 	}
 
+	private Image getDisabledImage(String iconURI, LocalResourceManager resourceManager) {
+		return createImage(iconURI, resourceManager, true);
+	}
+
 	protected void updateIcons() {
 		if (!(widget instanceof Item)) {
 			return;
@@ -184,14 +195,23 @@ protected void updateIcons() {
 			Image iconImage = getImage(iconURI, resourceManager);
 			item.setImage(iconImage);
 			item.setData(ICON_URI, iconURI);
-			if (item instanceof ToolItem) {
+			if (item instanceof ToolItem toolItem) {
 				iconImage = getImage(disabledURI, resourceManager);
-				((ToolItem) item).setDisabledImage(iconImage);
-				item.setData(DISABLED_URI, disabledURI);
+				toolItem.setDisabledImage(iconImage);
+				toolItem.setData(DISABLED_URI, disabledURI);
 			}
 			disposeOldImages();
 			localResourceManager = resourceManager;
 		}
+		// if there is no explicit disabled icon and the element becomes disabled,
+		// create it
+		boolean hasExplicitDisabledImage = "".equals(disabledURI); //$NON-NLS-1$
+		if (!modelItem.isEnabled() && !hasExplicitDisabledImage && item instanceof ToolItem toolItem) {
+			if (toolItem.getDisabledImage() == null) {
+				Image iconImage = getDisabledImage(iconURI, localResourceManager);
+				toolItem.setDisabledImage(iconImage);
+			}
+		}
 	}
 
 	private String getDisabledIconURI(MItem toolItem) {

bundles/org.eclipse.e4.ui.workbench.renderers.swt/icons/full/elcl16/view_menu.svg

@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.e4.ui.workbench3;singleton:=true
-Bundle-Version: 0.17.400.qualifier
+Bundle-Version: 0.17.500.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin

bundles/org.eclipse.e4.ui.workbench.renderers.swt/icons/full/elcl16/[email protected]

@@ -42,6 +42,7 @@
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.graphics.ImageData;
 import org.eclipse.swt.graphics.ImageLoader;
+import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Shell;
@@ -285,7 +286,8 @@ public void run() {
 
 					// Take a screenshot:
 					GC gc = new GC(display);
-					final Image image = new Image(display, display.getBounds());
+					Rectangle bounds = display.getBounds();
+					final Image image = new Image(display, bounds.width, bounds.height);
 					gc.copyArea(image, 0, 0);
 					gc.dispose();
 

bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/AbstractContributionItem.java

@@ -4,10 +4,11 @@ Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.jface.notifications
-Bundle-Version: 0.7.300.qualifier
+Bundle-Version: 0.7.400.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Export-Package: org.eclipse.jface.notifications,
  org.eclipse.jface.notifications.internal;x-internal:=true
 Automatic-Module-Name: org.eclipse.jface.notifications
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.29.0",
  org.eclipse.jface;bundle-version="3.20.0"
+Require-Capability: eclipse.swt;filter:="(image.format=svg)"

bundles/org.eclipse.e4.ui.workbench3/META-INF/MANIFEST.MF

@@ -49,8 +49,8 @@ public class CommonImages {
 
 	private static final String T_EVIEW = "eview16"; //$NON-NLS-1$
 
-	public static final ImageDescriptor NOTIFICATION_CLOSE = create(T_EVIEW, "notification-close.png"); //$NON-NLS-1$
-	public static final ImageDescriptor NOTIFICATION_CLOSE_HOVER = create(T_EVIEW, "notification-close-active.png"); //$NON-NLS-1$
+	public static final ImageDescriptor NOTIFICATION_CLOSE = create(T_EVIEW, "notification-close.svg"); //$NON-NLS-1$
+	public static final ImageDescriptor NOTIFICATION_CLOSE_HOVER = create(T_EVIEW, "notification-close-active.svg"); //$NON-NLS-1$
 
 	private static ImageDescriptor create(String prefix, String name) {
 		try {

bundles/org.eclipse.e4.ui.workbench3/src/org/eclipse/ui/testing/dumps/TimeoutDumpTimer.java

@@ -40,3 +40,4 @@ Require-Bundle:
 Import-Package: com.ibm.icu.text
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Automatic-Module-Name: org.eclipse.jface.text
+Require-Capability: eclipse.swt;filter:="(image.format=svg)"