Attachment 224810 Details for Bug 387234 – Patch v.0.1

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

[patch] Patch v.0.1

patch387234.txt (text/plain), 3.40 KB, created by Szymon Ptaszkiewicz

on 2012-12-17 13:07:42 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Szymon Ptaszkiewicz

Created: 2012-12-17 13:07:42 EST

Size: 3.40 KB

patch

obsolete

>diff --git a/bundles/org.eclipse.e4.ui.workbench.swt/src/org/eclipse/e4/ui/internal/workbench/swt/PartRenderingEngine.java b/bundles/org.eclipse.e4.ui.workbench.swt/src/org/eclipse/e4/ui/internal/workbench/swt/PartRenderingEngine.java
>index 6396908..37677df 100644
>--- a/bundles/org.eclipse.e4.ui.workbench.swt/src/org/eclipse/e4/ui/internal/workbench/swt/PartRenderingEngine.java
>+++ b/bundles/org.eclipse.e4.ui.workbench.swt/src/org/eclipse/e4/ui/internal/workbench/swt/PartRenderingEngine.java
>@@ -116,9 +116,8 @@
> 
> 			boolean menuChild = parent instanceof MMenu;
> 
>-			// If the parent isn't displayed who cares?
> 			if (!(parent instanceof MApplication)
>-					&& (parent == null || parent.getWidget() == null || menuChild))
>+					&& (parent == null || menuChild))
> 				return;
> 
> 			if (changedElement.isToBeRendered()) {
>diff --git a/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/workbench/PartRenderingEngineTests.java b/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/workbench/PartRenderingEngineTests.java
>index 3834b36..543b0ff 100644
>--- a/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/workbench/PartRenderingEngineTests.java
>+++ b/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/tests/workbench/PartRenderingEngineTests.java
>@@ -3275,6 +3275,61 @@
> 		assertEquals(shell, obj.getControl().getShell());
> 	}
> 
>+	public void testBug387234() {
>+		MApplication application = ApplicationFactoryImpl.eINSTANCE
>+				.createApplication();
>+
>+		MWindow window = BasicFactoryImpl.eINSTANCE.createWindow();
>+		application.getChildren().add(window);
>+		application.setSelectedElement(window);
>+
>+		MPartStack stack = BasicFactoryImpl.eINSTANCE.createPartStack();
>+		window.getChildren().add(stack);
>+		window.setSelectedElement(stack);
>+
>+		MPart part = BasicFactoryImpl.eINSTANCE.createPart();
>+		stack.getChildren().add(part);
>+		stack.setSelectedElement(part);
>+
>+		MWindow detachedWindow = BasicFactoryImpl.eINSTANCE.createWindow();
>+		window.getWindows().add(detachedWindow);
>+
>+		MPartStack detachedStack = BasicFactoryImpl.eINSTANCE.createPartStack();
>+		detachedWindow.getChildren().add(detachedStack);
>+		detachedWindow.setSelectedElement(detachedStack);
>+
>+		application.setContext(appContext);
>+		appContext.set(MApplication.class.getName(), application);
>+
>+		wb = new E4Workbench(application, appContext);
>+		wb.createAndRunUI(window);
>+
>+		stack.getChildren().remove(part);
>+		detachedStack.getChildren().add(part);
>+		detachedStack.setSelectedElement(part);
>+
>+		assertTrue("Detached window should be rendered",
>+				detachedWindow.isToBeRendered());
>+		assertTrue("Detached stack should be rendered",
>+				detachedStack.isToBeRendered());
>+		assertTrue("Part should be rendered", part.isToBeRendered());
>+
>+		Shell shell = (Shell) detachedWindow.getWidget();
>+		shell.close();
>+		spinEventLoop(); // process pending events
>+
>+		assertFalse("Detached window should not be rendered",
>+				detachedWindow.isToBeRendered());
>+		assertFalse("Detached stack should not be rendered",
>+				detachedStack.isToBeRendered());
>+		assertFalse("Part should not be rendered", part.isToBeRendered());
>+
>+		assertNull("Selected element should be null",
>+				detachedStack.getSelectedElement());
>+		assertNull("Selected element should be null",
>+				detachedWindow.getSelectedElement());
>+	}
>+
> 	private MWindow createWindowWithOneView(String partName) {
> 		final MWindow window = BasicFactoryImpl.eINSTANCE.createWindow();
> 		window.setHeight(300);

Actions: View | Diff

Attachments on bug 387234: 224810 | 226916