Skip to content

Commit 911868f

Browse files
authored
refs #117960 (#117976)
1 parent 62c69b3 commit 911868f

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/vs/workbench/browser/actions/layoutActions.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -678,7 +678,7 @@ export class MoveFocusedViewAction extends Action {
678678
.map(viewletId => {
679679
return {
680680
id: viewletId,
681-
label: this.viewDescriptorService.getViewContainerById(viewletId)!.title
681+
label: this.viewDescriptorService.getViewContainerModel(this.viewDescriptorService.getViewContainerById(viewletId)!)!.title
682682
};
683683
}));
684684

@@ -699,7 +699,7 @@ export class MoveFocusedViewAction extends Action {
699699
.map(panel => {
700700
return {
701701
id: panel.id,
702-
label: this.viewDescriptorService.getViewContainerById(panel.id)!.title
702+
label: this.viewDescriptorService.getViewContainerModel(this.viewDescriptorService.getViewContainerById(panel.id)!)!.title
703703
};
704704
}));
705705

src/vs/workbench/browser/parts/views/viewsService.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ export class ViewsService extends Disposable implements IViewsService {
143143
for (const viewDescriptor of views) {
144144
const disposables = new DisposableStore();
145145
disposables.add(this.registerOpenViewAction(viewDescriptor));
146-
disposables.add(this.registerFocusViewAction(viewDescriptor, composite?.name ?? CATEGORIES.View));
146+
disposables.add(this.registerFocusViewAction(viewDescriptor, composite?.name && composite.name !== composite.id ? composite.name : CATEGORIES.View));
147147
disposables.add(this.registerResetViewLocationAction(viewDescriptor));
148148
this.viewDisposable.set(viewDescriptor, disposables);
149149
}

0 commit comments

Comments
 (0)