Merge branch 'master' into 698_mousedown_preventDefault

This commit is contained in:
Daniel Imms
2017-06-12 14:53:48 -07:00
committed by GitHub
+2 -1
View File
@@ -779,7 +779,8 @@ Terminal.loadAddon = function(addon, callback) {
Terminal.prototype.updateCharSizeStyles = function() { Terminal.prototype.updateCharSizeStyles = function() {
this.charSizeStyleElement.textContent = this.charSizeStyleElement.textContent =
`.xterm-wide-char{width:${this.charMeasure.width * 2}px;}` + `.xterm-wide-char{width:${this.charMeasure.width * 2}px;}` +
`.xterm-normal-char{width:${this.charMeasure.width}px;}`; `.xterm-normal-char{width:${this.charMeasure.width}px;}` +
`.xterm-rows > div{height:${this.charMeasure.height}px;}`;
} }
/** /**