diff options
| author | SteVen Batten <6561887+sbatten@users.noreply.github.com> | 2021-03-02 21:00:33 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-02 21:00:33 +0300 |
| commit | 911868fa1264673d1461230e378ff9c8f3531f3c (patch) | |
| tree | 3e45553bc045e3007d65ad53617e8e92f56935ce | |
| parent | 62c69b32bf79524c96f89c7b8dfb940eb7547072 (diff) | |
refs #117960 (#117976)
| -rw-r--r-- | src/vs/workbench/browser/actions/layoutActions.ts | 4 | ||||
| -rw-r--r-- | src/vs/workbench/browser/parts/views/viewsService.ts | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/vs/workbench/browser/actions/layoutActions.ts b/src/vs/workbench/browser/actions/layoutActions.ts index 2f3c7c31c6a..75fb709ed6c 100644 --- a/src/vs/workbench/browser/actions/layoutActions.ts +++ b/src/vs/workbench/browser/actions/layoutActions.ts @@ -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 }; })); diff --git a/src/vs/workbench/browser/parts/views/viewsService.ts b/src/vs/workbench/browser/parts/views/viewsService.ts index f7dd97aa864..8d1ba53df2f 100644 --- a/src/vs/workbench/browser/parts/views/viewsService.ts +++ b/src/vs/workbench/browser/parts/views/viewsService.ts @@ -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); } |