Attachment #213981 for bug #355763

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Lines 28-33 Link Here

(-)a/bundles/org.eclipse.e4.ui.workbench.addons.swt/src/org/eclipse/e4/ui/workbench/addons/cleanupaddon/CleanupAddon.java (-1 / +8 lines)
28	import org.eclipse.e4.ui.model.application.ui.basic.MWindow;	28	import org.eclipse.e4.ui.model.application.ui.basic.MWindow;
29	import org.eclipse.e4.ui.model.application.ui.menu.MMenuElement;	29	import org.eclipse.e4.ui.model.application.ui.menu.MMenuElement;
30	import org.eclipse.e4.ui.model.application.ui.menu.MToolBar;	30	import org.eclipse.e4.ui.model.application.ui.menu.MToolBar;
		31	import org.eclipse.e4.ui.workbench.IPresentationEngine;
31	import org.eclipse.e4.ui.workbench.UIEvents;	32	import org.eclipse.e4.ui.workbench.UIEvents;
32	import org.eclipse.e4.ui.workbench.modeling.EModelService;	33	import org.eclipse.e4.ui.workbench.modeling.EModelService;
33	import org.eclipse.e4.ui.workbench.renderers.swt.SashLayout;	34	import org.eclipse.e4.ui.workbench.renderers.swt.SashLayout;
Lines 62-68 Link Here
62	// Determine the elements that should not ever be auto-destroyed	63	// Determine the elements that should not ever be auto-destroyed
63	if (container instanceof MApplication \|\| container instanceof MPerspectiveStack	64	if (container instanceof MApplication \|\| container instanceof MPerspectiveStack
64	\|\| container instanceof MMenuElement \|\| container instanceof MTrimBar	65	\|\| container instanceof MMenuElement \|\| container instanceof MTrimBar
65	\|\| container instanceof MToolBar \|\| container instanceof MArea) {	66	\|\| container instanceof MToolBar \|\| container instanceof MArea
		67	\|\| container.getTags().contains(IPresentationEngine.NO_AUTO_COLLAPSE)) {
66	return;	68	return;
67	}	69	}
68		70
Lines 262-267 Link Here
262	if (!container.isToBeRendered())	264	if (!container.isToBeRendered())
263	container.setToBeRendered(true);	265	container.setToBeRendered(true);
264	} else {	266	} else {
		267	// Never hide the container marked as no_close
		268	if (container.getTags().contains(IPresentationEngine.NO_AUTO_COLLAPSE)) {
		269	return;
		270	}
		271
265	int visCount = modelService.countRenderableChildren(container);	272	int visCount = modelService.countRenderableChildren(container);
266		273
267	// Remove stacks with no visible children from the display (but not the	274	// Remove stacks with no visible children from the display (but not the




	public static final String NO_CLOSE = "NoClose"; //$NON-NLS-1$

	/**
	 * Don't remove the element from the display even if it has no displayable children
	 */
	public static final String NO_AUTO_COLLAPSE = "NoAutoCollapse"; //$NON-NLS-1$

	/**
	 * When applied as a tag to an MUIElement inhibits moving the element (ie. through DnD...
	 */
	public static final String NO_MOVE = "NoMove"; //$NON-NLS-1$

	public static String MINIMIZED_BY_ZOOM = "MinimizedByZoom"; //$NON-NLS-1$

	/**
	 * This key should be used to add an optional String to an element that is a URI to the elements
	 * disabled icon. This is used, for example, by Toolbar Items which, in Eclipse SDK, provide a
	 * unique icon for disabled tool items that look better than the OS default graying on the
	 * default icon.
	 * 
	 * There is a strong argument to be made that this disabledIconURI actually be part of the model
	 */

Return to bug 355763

Lines 43-48 Link Here

(-)a/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/workbench/IPresentationEngine.java (-4 / +9 lines)
43	public static final String NO_CLOSE = "NoClose"; //$NON-NLS-1$	43	public static final String NO_CLOSE = "NoClose"; //$NON-NLS-1$
44		44
45	/**	45	/**
		46	* Don't remove the element from the display even if it has no displayable children
		47	*/
		48	public static final String NO_AUTO_COLLAPSE = "NoAutoCollapse"; //$NON-NLS-1$
		49
		50	/**
46	* When applied as a tag to an MUIElement inhibits moving the element (ie. through DnD...	51	* When applied as a tag to an MUIElement inhibits moving the element (ie. through DnD...
47	*/	52	*/
48	public static final String NO_MOVE = "NoMove"; //$NON-NLS-1$	53	public static final String NO_MOVE = "NoMove"; //$NON-NLS-1$
Lines 69-78 Link Here
69	public static String MINIMIZED_BY_ZOOM = "MinimizedByZoom"; //$NON-NLS-1$	74	public static String MINIMIZED_BY_ZOOM = "MinimizedByZoom"; //$NON-NLS-1$
70		75
71	/**	76	/**
72	* This key should be used to add an optional String to an element that is a	77	* This key should be used to add an optional String to an element that is a URI to the elements
73	* URI to the elements disabled icon. This is used, for example, by Toolbar Items	78	* disabled icon. This is used, for example, by Toolbar Items which, in Eclipse SDK, provide a
74	* which, in Eclipse SDK, provide a unique icon for disabled tool items that look better	79	* unique icon for disabled tool items that look better than the OS default graying on the
75	* than the OS default graying on the default icon.	80	* default icon.
76	*	81	*
77	* There is a strong argument to be made that this disabledIconURI actually be part of the model	82	* There is a strong argument to be made that this disabledIconURI actually be part of the model
78	*/	83	*/