Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
View | Details | Raw Unified | Return to bug 334580 | Differences between
and this patch

Collapse All | Expand All

(-)src/org/eclipse/e4/ui/workbench/renderers/swt/ToolBarManagerRenderer.java (-2 / +8 lines)
Lines 1-5 Link Here
1
/*******************************************************************************
1
/*******************************************************************************
2
 * Copyright (c) 2009 IBM Corporation and others.
2
 * Copyright (c) 2009, 2011 IBM Corporation and others.
3
 * All rights reserved. This program and the accompanying materials
3
 * All rights reserved. This program and the accompanying materials
4
 * are made available under the terms of the Eclipse Public License v1.0
4
 * are made available under the terms of the Eclipse Public License v1.0
5
 * which accompanies this distribution, and is available at
5
 * which accompanies this distribution, and is available at
Lines 18-23 Link Here
18
import javax.annotation.PostConstruct;
18
import javax.annotation.PostConstruct;
19
import javax.annotation.PreDestroy;
19
import javax.annotation.PreDestroy;
20
import javax.inject.Inject;
20
import javax.inject.Inject;
21
import javax.inject.Named;
21
import org.eclipse.e4.core.contexts.ContextInjectionFactory;
22
import org.eclipse.e4.core.contexts.ContextInjectionFactory;
22
import org.eclipse.e4.core.contexts.IEclipseContext;
23
import org.eclipse.e4.core.contexts.IEclipseContext;
23
import org.eclipse.e4.core.contexts.RunAndTrack;
24
import org.eclipse.e4.core.contexts.RunAndTrack;
Lines 66-71 Link Here
66
import org.eclipse.swt.widgets.Control;
67
import org.eclipse.swt.widgets.Control;
67
import org.eclipse.swt.widgets.Display;
68
import org.eclipse.swt.widgets.Display;
68
import org.eclipse.swt.widgets.Menu;
69
import org.eclipse.swt.widgets.Menu;
70
import org.eclipse.swt.widgets.Shell;
69
import org.eclipse.swt.widgets.ToolBar;
71
import org.eclipse.swt.widgets.ToolBar;
70
import org.eclipse.swt.widgets.ToolItem;
72
import org.eclipse.swt.widgets.ToolItem;
71
import org.eclipse.swt.widgets.Widget;
73
import org.eclipse.swt.widgets.Widget;
Lines 214-219 Link Here
214
	};
216
	};
215
	private Image viewMenuImage;
217
	private Image viewMenuImage;
216
218
219
	@Inject
220
	@Named("limbo")
221
	private Shell limbo;
222
217
	@PostConstruct
223
	@PostConstruct
218
	public void init() {
224
	public void init() {
219
		eventBroker.subscribe(UIEvents.buildTopic(UIEvents.UILabel.TOPIC),
225
		eventBroker.subscribe(UIEvents.buildTopic(UIEvents.UILabel.TOPIC),
Lines 693-699 Link Here
693
		Object widget = element.getWidget();
699
		Object widget = element.getWidget();
694
		if (widget instanceof Control) {
700
		if (widget instanceof Control) {
695
			// hide ourselves from the user interface
701
			// hide ourselves from the user interface
696
			((Control) widget).setVisible(false);
702
			((Control) widget).setParent(limbo);
697
		}
703
		}
698
	}
704
	}
699
705
(-)src/org/eclipse/e4/ui/internal/workbench/swt/PartRenderingEngine.java (-3 lines)
Lines 454-462 Link Here
454
		if (currentWidget != null) {
454
		if (currentWidget != null) {
455
			if (currentWidget instanceof Control) {
455
			if (currentWidget instanceof Control) {
456
				Control control = (Control) currentWidget;
456
				Control control = (Control) currentWidget;
457
				// make sure the control is visible
458
				control.setVisible(true);
459
460
				if (parentWidget instanceof Composite) {
457
				if (parentWidget instanceof Composite) {
461
					Composite currentParent = control.getParent();
458
					Composite currentParent = control.getParent();
462
					if (currentParent != parentWidget) {
459
					if (currentParent != parentWidget) {

Return to bug 334580