Attachment 191024 Details for Bug 334580 – ToolBar rendering patch v1

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

[patch] ToolBar rendering patch v1

bug334580-patch-v1.txt (text/plain), 3.13 KB, created by Remy Suen

on 2011-03-11 14:51:52 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Remy Suen

Created: 2011-03-11 14:51:52 EST

Size: 3.13 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.e4.ui.workbench.renderers.swt
>Index: src/org/eclipse/e4/ui/workbench/renderers/swt/ToolBarManagerRenderer.java
>===================================================================
>RCS file: /cvsroot/eclipse/e4/org.eclipse.e4.ui/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/ToolBarManagerRenderer.java,v
>retrieving revision 1.5
>diff -u -r1.5 ToolBarManagerRenderer.java
>--- src/org/eclipse/e4/ui/workbench/renderers/swt/ToolBarManagerRenderer.java	10 Mar 2011 18:17:12 -0000	1.5
>+++ src/org/eclipse/e4/ui/workbench/renderers/swt/ToolBarManagerRenderer.java	11 Mar 2011 19:51:18 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2009 IBM Corporation and others.
>+ * Copyright (c) 2009, 2011 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -18,6 +18,7 @@
> import javax.annotation.PostConstruct;
> import javax.annotation.PreDestroy;
> import javax.inject.Inject;
>+import javax.inject.Named;
> import org.eclipse.e4.core.contexts.ContextInjectionFactory;
> import org.eclipse.e4.core.contexts.IEclipseContext;
> import org.eclipse.e4.core.contexts.RunAndTrack;
>@@ -66,6 +67,7 @@
> import org.eclipse.swt.widgets.Control;
> import org.eclipse.swt.widgets.Display;
> import org.eclipse.swt.widgets.Menu;
>+import org.eclipse.swt.widgets.Shell;
> import org.eclipse.swt.widgets.ToolBar;
> import org.eclipse.swt.widgets.ToolItem;
> import org.eclipse.swt.widgets.Widget;
>@@ -214,6 +216,10 @@
> 	};
> 	private Image viewMenuImage;
> 
>+	@Inject
>+	@Named("limbo")
>+	private Shell limbo;
>+
> 	@PostConstruct
> 	public void init() {
> 		eventBroker.subscribe(UIEvents.buildTopic(UIEvents.UILabel.TOPIC),
>@@ -693,7 +699,7 @@
> 		Object widget = element.getWidget();
> 		if (widget instanceof Control) {
> 			// hide ourselves from the user interface
>-			((Control) widget).setVisible(false);
>+			((Control) widget).setParent(limbo);
> 		}
> 	}
> 
>#P org.eclipse.e4.ui.workbench.swt
>Index: src/org/eclipse/e4/ui/internal/workbench/swt/PartRenderingEngine.java
>===================================================================
>RCS file: /cvsroot/eclipse/e4/org.eclipse.e4.ui/bundles/org.eclipse.e4.ui.workbench.swt/src/org/eclipse/e4/ui/internal/workbench/swt/PartRenderingEngine.java,v
>retrieving revision 1.69
>diff -u -r1.69 PartRenderingEngine.java
>--- src/org/eclipse/e4/ui/internal/workbench/swt/PartRenderingEngine.java	10 Mar 2011 19:16:53 -0000	1.69
>+++ src/org/eclipse/e4/ui/internal/workbench/swt/PartRenderingEngine.java	11 Mar 2011 19:51:22 -0000
>@@ -454,9 +454,6 @@
> 		if (currentWidget != null) {
> 			if (currentWidget instanceof Control) {
> 				Control control = (Control) currentWidget;
>-				// make sure the control is visible
>-				control.setVisible(true);
>-
> 				if (parentWidget instanceof Composite) {
> 					Composite currentParent = control.getParent();
> 					if (currentParent != parentWidget) {

Actions: View | Diff

Attachments on bug 334580: 191024 | 192666 | 192735 | 192736