Skip to content

Commit 862d9d1

Browse files
trancexpressiloveeclipse
authored andcommitted
Hide commands from disabled activities in onboarding
This change adjusts ModeledPageLayout.addEditorOnboardingCommandId() to not show commands from activities that are not enabled. Fixes: #3248 Signed-off-by: Simeon Andreev <[email protected]>
1 parent 7d4cca3 commit 862d9d1

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/e4/compatibility/ModeledPageLayout.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import java.util.function.Function;
2525
import java.util.function.Predicate;
2626
import org.eclipse.core.runtime.IStatus;
27+
import org.eclipse.e4.core.services.contributions.IContributionFactory;
2728
import org.eclipse.e4.ui.internal.workbench.PartStackUtil;
2829
import org.eclipse.e4.ui.model.application.MApplication;
2930
import org.eclipse.e4.ui.model.application.commands.MBindingTable;
@@ -644,6 +645,10 @@ public void addEditorOnboardingCommandId(String commandId) {
644645
if (numberOfOnboardingCommands >= 5)
645646
return;
646647

648+
IContributionFactory contributionFactory = application.getContext().get(IContributionFactory.class);
649+
if (!contributionFactory.isEnabled(commandId))
650+
return;
651+
647652
Predicate<MKeyBinding> commandWithEqualId = b -> Optional.of(b).map(MKeyBinding::getCommand)
648653
.map(MCommand::getElementId).filter(elementId -> elementId.equals(commandId)).isPresent();
649654

0 commit comments

Comments
 (0)