maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

refs #117960

Browse source
This commit is contained in:
SteVen Batten 2021-03-02 08:45:45 -08:00
parent 5d4377de98
commit 2b50ba174f
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/vs/workbench/browser/actions/layoutActions.ts
View file

@ -678,7 +678,7 @@ export class MoveFocusedViewAction extends Action {
.map(viewletId => {
return {
id: viewletId,
label: this.viewDescriptorService.getViewContainerById(viewletId)!.title
label: this.viewDescriptorService.getViewContainerModel(this.viewDescriptorService.getViewContainerById(viewletId)!)!.title
};
}));
@ -699,7 +699,7 @@ export class MoveFocusedViewAction extends Action {
.map(panel => {
return {
id: panel.id,
label: this.viewDescriptorService.getViewContainerById(panel.id)!.title
label: this.viewDescriptorService.getViewContainerModel(this.viewDescriptorService.getViewContainerById(panel.id)!)!.title
};
}));

2
src/vs/workbench/browser/parts/views/viewsService.ts
View file

@ -143,7 +143,7 @@ export class ViewsService extends Disposable implements IViewsService {
for (const viewDescriptor of views) {
const disposables = new DisposableStore();
disposables.add(this.registerOpenViewAction(viewDescriptor));
disposables.add(this.registerFocusViewAction(viewDescriptor, composite?.name ?? CATEGORIES.View));
disposables.add(this.registerFocusViewAction(viewDescriptor, composite?.name && composite.name !== composite.id ? composite.name : CATEGORIES.View));
disposables.add(this.registerResetViewLocationAction(viewDescriptor));
this.viewDisposable.set(viewDescriptor, disposables);
}