Skip to content

Commit 66efeeb

Browse files
sandy081sandy081
committed
💄
1 parent 4a7dc99 commit 66efeeb

2 files changed

Lines changed: 20 additions & 32 deletions

File tree

‎src/vs/workbench/browser/parts/activitybar/activitybarPart.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -478,11 +478,11 @@ export class ActivitybarPart extends Part implements IActivityBarService {
478478
for (const viewlet of viewlets) {
479479
const viewContainer = this.getViewContainer(viewlet.id)!;
480480
const viewContainerModel = this.viewDescriptorService.getViewContainerModel(viewContainer);
481-
this.updateActivity(viewlet, viewContainerModel);
481+
this.updateActivity(viewContainer, viewContainerModel);
482482
this.onDidChangeActiveViews(viewContainer, viewContainerModel);
483483

484484
const disposables = new DisposableStore();
485-
disposables.add(viewContainerModel.onDidChangeContainerInfo(() => this.updateActivity(viewlet, viewContainerModel)));
485+
disposables.add(viewContainerModel.onDidChangeContainerInfo(() => this.updateActivity(viewContainer, viewContainerModel)));
486486
disposables.add(viewContainerModel.onDidChangeActiveViewDescriptors(() => this.onDidChangeActiveViews(viewContainer, viewContainerModel)));
487487

488488
this.viewletDisposables.set(viewlet.id, disposables);
@@ -499,17 +499,17 @@ export class ActivitybarPart extends Part implements IActivityBarService {
499499
this.hideComposite(viewletId);
500500
}
501501

502-
private updateActivity(viewlet: ViewletDescriptor, viewContainerModel: IViewContainerModel): void {
502+
private updateActivity(viewContainer: ViewContainer, viewContainerModel: IViewContainerModel): void {
503503

504504
const activity: IActivity = {
505-
id: viewlet.id,
505+
id: viewContainer.id,
506506
name: viewContainerModel.title,
507507
iconUrl: URI.isUri(viewContainerModel.icon) ? viewContainerModel.icon : undefined,
508508
cssClass: isString(viewContainerModel.icon) ? viewContainerModel.icon : undefined,
509-
keybindingId: viewlet.keybindingId
509+
keybindingId: viewContainer.focusCommand?.id || viewContainer.id
510510
};
511511

512-
const { activityAction, pinnedAction } = this.getCompositeActions(viewlet.id);
512+
const { activityAction, pinnedAction } = this.getCompositeActions(viewContainer.id);
513513
activityAction.setActivity(activity);
514514

515515
if (pinnedAction instanceof PlaceHolderToggleCompositePinnedAction) {

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

Lines changed: 14 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -209,14 +209,14 @@ export class PanelPart extends CompositePart<Panel> implements IPanelService {
209209
}
210210

211211
for (const panel of panels) {
212-
this.enableCompositeActions(panel);
213212
const viewContainer = this.getViewContainer(panel.id)!;
214213
const viewContainerModel = this.viewDescriptorService.getViewContainerModel(viewContainer);
215-
this.onDidChangeActiveViews(panel, viewContainerModel, viewContainer.hideIfEmpty);
214+
this.updateActivity(viewContainer, viewContainerModel);
215+
this.onDidChangeActiveViews(viewContainer, viewContainerModel);
216216

217217
const disposables = new DisposableStore();
218-
disposables.add(viewContainerModel.onDidChangeActiveViewDescriptors(() => this.onDidChangeActiveViews(panel, viewContainerModel, viewContainer.hideIfEmpty)));
219-
disposables.add(viewContainerModel.onDidChangeContainerInfo(() => this.onDidUpdateViews(panel, viewContainerModel)));
218+
disposables.add(viewContainerModel.onDidChangeActiveViewDescriptors(() => this.onDidChangeActiveViews(viewContainer, viewContainerModel)));
219+
disposables.add(viewContainerModel.onDidChangeContainerInfo(() => this.updateActivity(viewContainer, viewContainerModel)));
220220

221221
this.panelDisposables.set(panel.id, disposables);
222222
}
@@ -232,40 +232,28 @@ export class PanelPart extends CompositePart<Panel> implements IPanelService {
232232
this.hideComposite(panelId);
233233
}
234234

235-
private enableCompositeActions(panel: PanelDescriptor): void {
236-
const { activityAction, pinnedAction } = this.getCompositeActions(panel.id);
237-
activityAction.setActivity(panel);
238-
239-
if (pinnedAction instanceof PlaceHolderToggleCompositePinnedAction) {
240-
pinnedAction.setActivity(panel);
241-
}
242-
}
243-
244-
private updateActivity(panel: PanelDescriptor, viewContainerModel: IViewContainerModel): void {
235+
private updateActivity(viewContainer: ViewContainer, viewContainerModel: IViewContainerModel): void {
245236
const activity: IActivity = {
246-
id: panel.id,
237+
id: viewContainer.id,
247238
name: viewContainerModel.title,
248-
keybindingId: panel.keybindingId
239+
keybindingId: viewContainer.focusCommand?.id
249240
};
250241

251-
const { activityAction, pinnedAction } = this.getCompositeActions(panel.id);
242+
const { activityAction, pinnedAction } = this.getCompositeActions(viewContainer.id);
252243
activityAction.setActivity(activity);
253244

254245
if (pinnedAction instanceof PlaceHolderToggleCompositePinnedAction) {
255246
pinnedAction.setActivity(activity);
256247
}
257-
}
258248

259-
private onDidUpdateViews(panel: PanelDescriptor, viewDescriptors: IViewContainerModel): void {
260-
this.updateActivity(panel, viewDescriptors);
249+
this.saveCachedPanels();
261250
}
262251

263-
private onDidChangeActiveViews(panel: PanelDescriptor, viewDescriptors: IViewContainerModel, hideIfEmpty?: boolean): void {
264-
if (viewDescriptors.activeViewDescriptors.length) {
265-
this.updateActivity(panel, viewDescriptors);
266-
this.compositeBar.addComposite(panel);
267-
} else if (hideIfEmpty) {
268-
this.hideComposite(panel.id);
252+
private onDidChangeActiveViews(viewContainer: ViewContainer, viewContainerModel: IViewContainerModel): void {
253+
if (viewContainerModel.activeViewDescriptors.length) {
254+
this.compositeBar.addComposite(viewContainer);
255+
} else if (viewContainer.hideIfEmpty) {
256+
this.hideComposite(viewContainer.id);
269257
}
270258
}
271259

0 commit comments

Comments
 (0)