Attachment 156398 Details for Bug 299379 – A simpler patch

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

[patch] A simpler patch

patch(299379).txt (text/plain), 1.67 KB, created by Eric Moffatt

on 2010-01-18 11:12:17 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Eric Moffatt

Created: 2010-01-18 11:12:17 EST

Size: 1.67 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.e4.ui.workbench.renderers.swt
>Index: src/org/eclipse/e4/workbench/ui/renderers/swt/StackRenderer.java
>===================================================================
>RCS file: /cvsroot/eclipse/e4/org.eclipse.e4.ui/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/workbench/ui/renderers/swt/StackRenderer.java,v
>retrieving revision 1.28
>diff -u -r1.28 StackRenderer.java
>--- src/org/eclipse/e4/workbench/ui/renderers/swt/StackRenderer.java	13 Jan 2010 19:05:16 -0000	1.28
>+++ src/org/eclipse/e4/workbench/ui/renderers/swt/StackRenderer.java	18 Jan 2010 16:10:50 -0000
>@@ -327,6 +327,13 @@
> 
> 		// Hook up special logic to synch up the Tab Items
> 		hookTabControllerLogic(stack, part, cti);
>+
>+		// Re-ensure that the activeChild == the selected tab
>+		if (stack.getActiveChild() != null) {
>+			CTabItem selCTI = findItemForPart(stack, stack.getActiveChild());
>+			if (selCTI != null && selCTI != ctf.getSelection())
>+				ctf.setSelection(selCTI);
>+		}
> 	}
> 
> 	private int calcIndexFor(MElementContainer<MUIElement> stack,
>@@ -397,6 +404,18 @@
> 			oldItem.setControl(null); // prevent the widget from being disposed
> 			oldItem.dispose();
> 		}
>+
>+		// Check if we have to reset the currently active child for the stack
>+		if (parentElement.getActiveChild() == child) {
>+			// HACK!! we'll reset to the first element for now but really should
>+			// be based on the activation chain
>+			if (parentElement.getChildren().size() == 0) {
>+				parentElement.setActiveChild(null);
>+			} else {
>+				parentElement
>+						.setActiveChild(parentElement.getChildren().get(0));
>+			}
>+		}
> 	}
> 
> 	@Override

Actions: View | Diff

Attachments on bug 299379: 155868 | 156265 | 156398