| author | Eric Moffatt | 2012-10-01 14:01:12 (EDT) |
|---|---|---|
| committer | Eric Moffatt | 2012-10-01 14:01:12 (EDT) |
| commit | 68563a1ed96cd665494202405ba23ec80dca42eb (patch) (side-by-side diff) | |
| tree | dbe8f53a6ca33a24b9fa2a5744f1a09a9aafe9f4 | |
| parent | 33b09f270cc969502514aff47fb2125128ba5db1 (diff) | |
| download | eclipse.platform.ui-68563a1ed96cd665494202405ba23ec80dca42eb.zip eclipse.platform.ui-68563a1ed96cd665494202405ba23ec80dca42eb.tar.gz eclipse.platform.ui-68563a1ed96cd665494202405ba23ec80dca42eb.tar.bz2 | |
Fix for Bug 280825 - Support for multiple window icons
| -rw-r--r-- | bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/WBWRenderer.java | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/WBWRenderer.java b/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/WBWRenderer.java index 5c69d0a..044723d 100644 --- a/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/WBWRenderer.java +++ b/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/WBWRenderer.java @@ -493,9 +493,14 @@ public class WBWRenderer extends SWTPartRenderer { if (wbwModel.getLabel() != null) wbwShell.setText(wbwModel.getLocalizedLabel()); - wbwShell.setImage(getImage(wbwModel)); - // TODO: This should be added to the model, see bug 308494 - wbwShell.setImages(Window.getDefaultImages()); + if (wbwModel.getIconURI() != null && wbwModel.getIconURI().length() > 0) { + wbwShell.setImage(getImage(wbwModel)); + } else { + // TODO: This should be added to the model, see bug 308494 + // it allows for a range of icon sizes that the platform gets to + // choose from + wbwShell.setImages(Window.getDefaultImages()); + } return newWidget; } |