Merge from vscode e5834d3280fcd04898efeac32b9cf1b893f9b127 (#9385)

* Merge from vscode e5834d3280fcd04898efeac32b9cf1b893f9b127

* distro
This commit is contained in:
Anthony Dresser
2020-02-28 00:37:06 -08:00
committed by GitHub
parent 70851716f7
commit 5d13ebf0d2
143 changed files with 1711 additions and 934 deletions

View File

@@ -114,7 +114,7 @@ export class TerminalViewPane extends ViewPane {
}));
// Force another layout (first is setContainers) since config has changed
this.layoutBody(this._terminalContainer.offsetWidth, this._terminalContainer.offsetHeight);
this.layoutBody(this._terminalContainer.offsetHeight, this._terminalContainer.offsetWidth);
}
protected layoutBody(height: number, width: number): void {
@@ -321,7 +321,7 @@ export class TerminalViewPane extends ViewPane {
}
// TODO: Can we support ligatures?
// dom.toggleClass(this._parentDomElement, 'enable-ligatures', this._terminalService.configHelper.config.fontLigatures);
this.layoutBody(this._parentDomElement.offsetWidth, this._parentDomElement.offsetHeight);
this.layoutBody(this._parentDomElement.offsetHeight, this._parentDomElement.offsetWidth);
}
}