Skip to content

Commit b4b96c8

Browse files
authored
prevent hiding of actions of the global panel part menu (microsoft#162335)
microsoft#162006
1 parent de91b73 commit b4b96c8

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

src/vs/workbench/browser/parts/panel/panelPart.ts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ import { IPartOptions } from 'vs/workbench/browser/part';
4545
import { StringSHA1 } from 'vs/base/common/hash';
4646
import { URI } from 'vs/base/common/uri';
4747
import { Extensions, IProfileStorageRegistry } from 'vs/workbench/services/userDataProfile/common/userDataProfileStorageRegistry';
48-
import { WorkbenchToolBar } from 'vs/platform/actions/browser/toolbar';
48+
import { ToolBar } from 'vs/base/browser/ui/toolbar/toolbar';
4949

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

113-
private globalToolBar: WorkbenchToolBar | undefined;
113+
private globalToolBar: ToolBar | undefined;
114114
private globalActions: CompositeMenuActions;
115115

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

551551
// Global Actions Toolbar
552-
this.globalToolBar = this._register(this.instantiationService.createInstance(WorkbenchToolBar, globalTitleActionsContainer, {
552+
this.globalToolBar = this._register(new ToolBar(globalTitleActionsContainer, this.contextMenuService, {
553553
actionViewItemProvider: action => this.actionViewItemProvider(action),
554554
orientation: ActionsOrientation.HORIZONTAL,
555555
getKeyBinding: action => this.keybindingService.lookupKeybinding(action.id),
556556
anchorAlignmentProvider: () => this.getTitleAreaDropDownAnchorAlignment(),
557-
toggleMenuTitle: localize('moreActions', "More Actions..."),
558-
resetMenu: this.globalActions.menuId
557+
toggleMenuTitle: localize('moreActions', "More Actions...")
559558
}));
560559

561560
this.updateGlobalToolbarActions();

0 commit comments

Comments
 (0)