Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian de Alwis2012-05-10 15:48:13 +0000
committerBrian de Alwis2012-05-10 15:48:13 +0000
commitc84e4c53437c413aded6d2229248f2a3c7f83e9c (patch)
tree064434bb19c6862e889e01afed405fbb1e7f239b
parentae7e568ef81f060c0a0c77cd4939f601a04394af (diff)
downloadeclipse.platform.ui-I20120510-1900.tar.gz
eclipse.platform.ui-I20120510-1900.tar.xz
eclipse.platform.ui-I20120510-1900.zip
Bug 378184 - [Compatibility] Part with custom title image loses the image after dropv20120510-1548I20120510-1900
-rw-r--r--bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/SWTPartRenderer.java9
1 files changed, 9 insertions, 0 deletions
diff --git a/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/SWTPartRenderer.java b/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/SWTPartRenderer.java
index bacf1e4ac9b..4deccaf96de 100644
--- a/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/SWTPartRenderer.java
+++ b/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/SWTPartRenderer.java
@@ -16,6 +16,7 @@ import java.util.Map;
import org.eclipse.e4.core.contexts.IEclipseContext;
import org.eclipse.e4.core.services.log.Logger;
import org.eclipse.e4.ui.internal.workbench.swt.AbstractPartRenderer;
+import org.eclipse.e4.ui.model.application.MApplicationElement;
import org.eclipse.e4.ui.model.application.ui.MElementContainer;
import org.eclipse.e4.ui.model.application.ui.MUIElement;
import org.eclipse.e4.ui.model.application.ui.MUILabel;
@@ -167,6 +168,14 @@ public abstract class SWTPartRenderer extends AbstractPartRenderer {
}
protected Image getImage(MUILabel element) {
+ if (element instanceof MApplicationElement) {
+ Object image = ((MApplicationElement) element).getTransientData()
+ .get(IPresentationEngine.OVERRIDE_ICON_IMAGE_KEY);
+ if (image instanceof Image && !((Image) image).isDisposed()) {
+ return (Image) image;
+ }
+ }
+
IEclipseContext localContext = context;
String iconURI = element.getIconURI();
if (iconURI != null && iconURI.length() > 0) {

Back to the top