Skip to content

Commit 4e0cdb8

Browse files
vincentxu123nang-dev
authored andcommitted
Decouple pearai bar from activity bar
1 parent 8e0c336 commit 4e0cdb8

File tree

1 file changed

+2
-20
lines changed

1 file changed

+2
-20
lines changed

src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarPart.ts

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import { ActiveAuxiliaryContext, AuxiliaryBarFocusContext } from '../../../commo
1717
import { ACTIVITY_BAR_BADGE_BACKGROUND, ACTIVITY_BAR_BADGE_FOREGROUND, ACTIVITY_BAR_TOP_ACTIVE_BORDER, ACTIVITY_BAR_TOP_DRAG_AND_DROP_BORDER, ACTIVITY_BAR_TOP_FOREGROUND, ACTIVITY_BAR_TOP_INACTIVE_FOREGROUND, PANEL_ACTIVE_TITLE_BORDER, PANEL_ACTIVE_TITLE_FOREGROUND, PANEL_DRAG_AND_DROP_BORDER, PANEL_INACTIVE_TITLE_FOREGROUND, SIDE_BAR_BACKGROUND, SIDE_BAR_BORDER, SIDE_BAR_TITLE_BORDER, SIDE_BAR_FOREGROUND } from '../../../common/theme.js';
1818
import { IViewDescriptorService } from '../../../common/views.js';
1919
import { IExtensionService } from '../../../services/extensions/common/extensions.js';
20-
import { ActivityBarPosition, IWorkbenchLayoutService, LayoutSettings, Parts, Position } from '../../../services/layout/browser/layoutService.js';
20+
import { IWorkbenchLayoutService, Parts, Position } from '../../../services/layout/browser/layoutService.js';
2121
import { HoverPosition } from '../../../../base/browser/ui/hover/hoverWidget.js';
2222
import { IAction, Separator, SubmenuAction, toAction } from '../../../../base/common/actions.js';
2323
import { ToggleAuxiliaryBarAction } from './auxiliaryBarActions.js';
@@ -29,7 +29,6 @@ import { AbstractPaneCompositePart, CompositeBarPosition } from '../paneComposit
2929
import { ActionsOrientation, IActionViewItem, prepareActions } from '../../../../base/browser/ui/actionbar/actionbar.js';
3030
import { IPaneCompositeBarOptions } from '../paneCompositeBar.js';
3131
import { IMenuService, MenuId } from '../../../../platform/actions/common/actions.js';
32-
import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
3332
import { getContextMenuActions } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
3433
import { $ } from '../../../../base/browser/dom.js';
3534
import { HiddenItemStrategy, WorkbenchToolBar } from '../../../../platform/actions/browser/toolbar.js';
@@ -87,7 +86,6 @@ export class AuxiliaryBarPart extends AbstractPaneCompositePart {
8786
@IExtensionService extensionService: IExtensionService,
8887
@ICommandService commandService: ICommandService,
8988
@IMenuService menuService: IMenuService,
90-
@IConfigurationService private readonly configurationService: IConfigurationService
9189
) {
9290
super(
9391

@@ -117,22 +115,6 @@ export class AuxiliaryBarPart extends AbstractPaneCompositePart {
117115
menuService,
118116
commandService
119117
);
120-
121-
122-
this._register(configurationService.onDidChangeConfiguration(e => {
123-
if (e.affectsConfiguration(LayoutSettings.ACTIVITY_BAR_LOCATION)) {
124-
this.onDidChangeActivityBarLocation();
125-
}
126-
}));
127-
}
128-
129-
private onDidChangeActivityBarLocation(): void {
130-
this.updateCompositeBar();
131-
132-
const id = this.getActiveComposite()?.getId();
133-
if (id) {
134-
this.onTitleAreaUpdate(id);
135-
}
136118
}
137119

138120
override updateStyles(): void {
@@ -210,7 +192,7 @@ export class AuxiliaryBarPart extends AbstractPaneCompositePart {
210192
}
211193

212194
protected shouldShowCompositeBar(): boolean {
213-
return this.configurationService.getValue<ActivityBarPosition>(LayoutSettings.ACTIVITY_BAR_LOCATION) !== ActivityBarPosition.HIDDEN;
195+
return true;
214196
}
215197

216198
// TODO@benibenj chache this

0 commit comments

Comments
 (0)