diff options
| author | Eric Moffatt | 2013-11-19 18:01:56 +0000 |
|---|---|---|
| committer | Eric Moffatt | 2013-11-19 18:01:56 +0000 |
| commit | 6640e68957c1e5a8d211bf595d575c7ed2bbb3a8 (patch) | |
| tree | 99f20dc43ca22cac8f1136f26ae8e59a5ef52bca | |
| parent | 03c3b7e6e2c698fd61a64c4f1be3998798757ab7 (diff) | |
| download | eclipse.platform.ui-6640e68957c1e5a8d211bf595d575c7ed2bbb3a8.tar.gz eclipse.platform.ui-6640e68957c1e5a8d211bf595d575c7ed2bbb3a8.tar.xz eclipse.platform.ui-6640e68957c1e5a8d211bf595d575c7ed2bbb3a8.zip | |
Patch for Bug 387579 - [EditorMgmt] [regression] No
indication/decoration for pinned editor
2 files changed, 3 insertions, 1 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 40c242787a4..e8602b4cf84 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 @@ -219,7 +219,7 @@ public abstract class SWTPartRenderer extends AbstractPartRenderer { public Image getImage(MUILabel element) { Image image = (Image) ((MUIElement) element).getTransientData().get( IPresentationEngine.OVERRIDE_ICON_IMAGE_KEY); - if (image == null) { + if (image == null || image.isDisposed()) { String iconURI = element.getIconURI(); image = getImageFromURI(iconURI); } diff --git a/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/workbench/IPresentationEngine.java b/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/workbench/IPresentationEngine.java index 0dfdd857ee4..153e3dcee34 100644 --- a/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/workbench/IPresentationEngine.java +++ b/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/workbench/IPresentationEngine.java @@ -114,6 +114,8 @@ public interface IPresentationEngine { * This key should be used to add an optional org.eclipse.swt.graphics.Image to an elements * TRANSIENTDATA. If present, the image will be used to override that elements iconURI. An * example is drawing the error icon on a minimized problems view stack. + * + * NOTE: This image must be checked to ensure that it hasn't been disposed on retrieval. */ public static final String OVERRIDE_ICON_IMAGE_KEY = "e4_override_icon_image_key"; //$NON-NLS-1$ |