Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

prevent hiding of actions of the global panel part menu #162335

Merged
merged 1 commit into from Sep 29, 2022
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 4 additions & 5 deletions src/vs/workbench/browser/parts/panel/panelPart.ts
Expand Up @@ -45,7 +45,7 @@ import { IPartOptions } from 'vs/workbench/browser/part';
import { StringSHA1 } from 'vs/base/common/hash';
import { URI } from 'vs/base/common/uri';
import { Extensions, IProfileStorageRegistry } from 'vs/workbench/services/userDataProfile/common/userDataProfileStorageRegistry';
import { WorkbenchToolBar } from 'vs/platform/actions/browser/toolbar';
import { ToolBar } from 'vs/base/browser/ui/toolbar/toolbar';

interface ICachedPanel {
id: string;
Expand Down Expand Up @@ -110,7 +110,7 @@ export abstract class BasePanelPart extends CompositePart<PaneComposite> impleme
private compositeBar: CompositeBar;
private readonly compositeActions = new Map<string, { activityAction: PanelActivityAction; pinnedAction: ToggleCompositePinnedAction }>();

private globalToolBar: WorkbenchToolBar | undefined;
private globalToolBar: ToolBar | undefined;
private globalActions: CompositeMenuActions;

private readonly panelDisposables: Map<string, IDisposable> = new Map<string, IDisposable>();
Expand Down Expand Up @@ -549,13 +549,12 @@ export abstract class BasePanelPart extends CompositePart<PaneComposite> impleme
const globalTitleActionsContainer = element.appendChild($('.global-actions'));

// Global Actions Toolbar
this.globalToolBar = this._register(this.instantiationService.createInstance(WorkbenchToolBar, globalTitleActionsContainer, {
this.globalToolBar = this._register(new ToolBar(globalTitleActionsContainer, this.contextMenuService, {
actionViewItemProvider: action => this.actionViewItemProvider(action),
orientation: ActionsOrientation.HORIZONTAL,
getKeyBinding: action => this.keybindingService.lookupKeybinding(action.id),
anchorAlignmentProvider: () => this.getTitleAreaDropDownAnchorAlignment(),
toggleMenuTitle: localize('moreActions', "More Actions..."),
resetMenu: this.globalActions.menuId
toggleMenuTitle: localize('moreActions', "More Actions...")
}));

this.updateGlobalToolbarActions();
Expand Down