Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Loskutov2015-01-31 18:31:53 +0000
committerWojciech Sudol2015-04-13 15:05:45 +0000
commiteec0adbe44c504e555a1ade73e761256a7a8a9ba (patch)
tree7120b467cf8ae5609402037d57721147b584a84c
parent42d3d4b17a939ab5febe355352392e9ce488f9ab (diff)
downloadeclipse.platform.ui-eec0adbe44c504e555a1ade73e761256a7a8a9ba.tar.gz
eclipse.platform.ui-eec0adbe44c504e555a1ade73e761256a7a8a9ba.tar.xz
eclipse.platform.ui-eec0adbe44c504e555a1ade73e761256a7a8a9ba.zip
Bug 458728 - [ActivityMgmt] Enabling capability doesn't show toolbar
buttons until restart Don't change model visibility in the setChildVisible() method - because this method is not a generic method to set the child visibility at all, it is only for applying the IContributionManagerOverrides state to model elements. Changed the misleading method name accordingly to applyOverridenVisibility() to avoid further confusion. Change-Id: If64593fbcd1104fa05db27be4b5fad063bd3d763 Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
-rw-r--r--bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/CoolBarToTrimManager.java9
1 files changed, 5 insertions, 4 deletions
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/CoolBarToTrimManager.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/CoolBarToTrimManager.java
index 8b6def25949..0c4e3f9db55 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/CoolBarToTrimManager.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/CoolBarToTrimManager.java
@@ -607,7 +607,7 @@ public class CoolBarToTrimManager extends ContributionManager implements ICoolBa
MToolBarElement toolBarElem = renderer.getToolElement(item);
if (toolBarElem != null) {
if (container.isVisible()) {
- setChildVisible(toolBarElem, item, manager);
+ applyOverridenVisibility(toolBarElem, item, manager);
continue;
}
if (item.isSeparator() || item.isGroupMarker()) {
@@ -617,7 +617,7 @@ public class CoolBarToTrimManager extends ContributionManager implements ICoolBa
// If the toolbar is hidden but one of the children is not,
// make both the child and the toolbar visible
if (isChildVisible(item, manager)) {
- setChildVisible(toolBarElem, item, manager);
+ applyOverridenVisibility(toolBarElem, item, manager);
container.setVisible(true);
}
continue;
@@ -665,7 +665,8 @@ public class CoolBarToTrimManager extends ContributionManager implements ICoolBa
}
}
- private void setChildVisible(MToolBarElement modelItem, IContributionItem item, IContributionManager manager) {
+ private void applyOverridenVisibility(MToolBarElement modelItem, IContributionItem item,
+ IContributionManager manager) {
Boolean overridenVisibility = getOverridenVisibility(item, manager);
Boolean prevChildVisible = (Boolean) modelItem.getTransientData().get(PREV_CHILD_VISIBLE);
@@ -680,7 +681,7 @@ public class CoolBarToTrimManager extends ContributionManager implements ICoolBa
modelItem.setVisible(prevChildVisible);
modelItem.getTransientData().remove(PREV_CHILD_VISIBLE);
} else {
- modelItem.setVisible(item.isVisible());
+ return;
}
}

Back to the top