Attachment 173869 Details for Bug 319392 – Fix the Z-Order on TBR and visibility changes

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

[patch] Fix the Z-Order on TBR and visibility changes

patch(319392) (text/plain), 2.13 KB, created by Eric Moffatt

on 2010-07-09 10:41:48 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Eric Moffatt

Created: 2010-07-09 10:41:48 EDT

Size: 2.13 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#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.32
>diff -u -r1.32 PartRenderingEngine.java
>--- src/org/eclipse/e4/ui/internal/workbench/swt/PartRenderingEngine.java	6 Jul 2010 20:52:46 -0000	1.32
>+++ src/org/eclipse/e4/ui/internal/workbench/swt/PartRenderingEngine.java	9 Jul 2010 14:40:39 -0000
>@@ -115,7 +115,10 @@
> 				Activator.trace(Policy.DEBUG_RENDERER, "visible -> true", null); //$NON-NLS-1$
> 
> 				// Note that the 'createGui' protocol calls 'childAdded'
>-				createGui(changedElement);
>+				Widget w = (Widget) createGui(changedElement);
>+				if (w instanceof Control && !(w instanceof Shell)) {
>+					fixZOrder(changedElement);
>+				}
> 			} else {
> 				Activator
> 						.trace(Policy.DEBUG_RENDERER, "visible -> false", null); //$NON-NLS-1$
>@@ -183,6 +186,7 @@
> 					// NOTE: createGui will call 'childAdded' if successful
> 					Widget w = (Widget) createGui(added);
> 					if (w instanceof Control && !(w instanceof Shell)) {
>+						fixZOrder(added);
> 						((Control) w).getShell().layout(
> 								new Control[] { (Control) w }, SWT.DEFER);
> 					}
>@@ -239,6 +243,26 @@
> 		this.factoryUrl = factoryUrl;
> 	}
> 
>+	protected void fixZOrder(MUIElement element) {
>+		MElementContainer<MUIElement> parent = element.getParent();
>+		if (parent == null || !(element.getWidget() instanceof Control))
>+			return;
>+
>+		Control elementCtrl = (Control) element.getWidget();
>+		Control prevCtrl = null;
>+		for (MUIElement kid : parent.getChildren()) {
>+			if (kid == element) {
>+				if (prevCtrl != null)
>+					elementCtrl.moveBelow(prevCtrl);
>+				else
>+					elementCtrl.moveAbove(null);
>+				return;
>+			} else if (kid.getWidget() instanceof Control) {
>+				prevCtrl = (Control) kid.getWidget();
>+			}
>+		}
>+	}
>+
> 	/**
> 	 * Initialize a part renderer from the extension point.
> 	 *

Actions: View | Diff

Attachments on bug 319392: 173869