Bug 518666 - Toolbar does not come back after last ToolItem is hidden temporarily

Change-Id: Idee8070cbe234d1699bf2234ea7c061caa113e3c

1 files changed, 8 insertions, 1 deletions

diff --git a/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/ToolBarContributionRecord.java b/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/ToolBarContributionRecord.java
index c0417563410..82b9a4fdb42 100644
--- a/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/ToolBarContributionRecord.java
+++ b/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/ToolBarContributionRecord.java
@@ -18,6 +18,7 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
+import java.util.stream.Stream;
 import org.eclipse.core.expressions.ExpressionInfo;
 import org.eclipse.e4.core.commands.ExpressionContext;
 import org.eclipse.e4.core.contexts.EclipseContextFactory;
@@ -81,7 +82,13 @@ public class ToolBarContributionRecord {
 		}
 
 		if (changed) {
-			getManagerForModel().markDirty();
+			ToolBarManager managerForModel = getManagerForModel();
+			managerForModel.markDirty();
+			// Make sure the MToolBar model is visible because
+			// TrimBarLayout.hideManagedTB hides and IPresentationEngine moves
+			// it to the Limbo-Shell
+			Stream.of(managerForModel.getItems()).filter(i -> i.isVisible()).findFirst()
+					.ifPresent((i) -> toolbarModel.setVisible(true));
 		}
 	}