microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-07-10 16:58:55 -05:00
Code Issues Packages Projects Releases 177 Wiki Activity

#29609 Check for split view existence

Browse Source
This commit is contained in:
Sandeep Somavarapu
2017-06-28 18:10:48 +02:00
parent 81a9bb5013
commit ff1d3c2f0f
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/vs/workbench/parts/views/browser/views.ts
View File

@@ -359,14 +359,14 @@ export class ComposedViewsViewlet extends Viewlet {
public getTitle(): string {
let title = Registry.as<ViewletRegistry>(Extensions.Viewlets).getViewlet(this.getId()).name;
if (this.hasSingleView()) {
if (this.hasSingleView() && this.views[0]) {
title += ': ' + this.views[0].name;
}
return title;
}
public getActions(): IAction[] {
if (this.hasSingleView()) {
if (this.hasSingleView() && this.views[0]) {
return this.views[0].getActions();
}
return [];
@@ -374,7 +374,7 @@ export class ComposedViewsViewlet extends Viewlet {
public getSecondaryActions(): IAction[] {
let actions = [];
if (this.hasSingleView()) {
if (this.hasSingleView() && this.views[0]) {
actions = this.views[0].getSecondaryActions();
}
@@ -419,10 +419,12 @@ export class ComposedViewsViewlet extends Viewlet {
}
private layoutViews(): void {
this.splitView.layout(this.dimension.height);
for (const view of this.views) {
let viewState = this.createViewState(view);
this.viewsStates.set(view.id, viewState);
if (this.splitView) {
this.splitView.layout(this.dimension.height);
for (const view of this.views) {
let viewState = this.createViewState(view);
this.viewsStates.set(view.id, viewState);
}
}
}
@@ -580,6 +582,10 @@ export class ComposedViewsViewlet extends Viewlet {
}
private onViewsUpdated(): TPromise<void> {
if (!this.splitView) {
return TPromise.as(null);
}
if (this.hasSingleView()) {
if (this.views[0]) {
this.views[0].hideHeader();