Merge branch 'master' into control-seq-handler

2018-12-31 19:07:58 -08:00
parent bbfe149397 4375b3cdb9
commit 48c1d36d77
15 changed files with 337 additions and 154 deletions
@@ -38,7 +38,7 @@ export class CharMeasure extends EventEmitter implements ICharMeasure {
  }

  public measure(options: ITerminalOptions): void {
-  this._measureElement.style.fontFamily = options.fontFamily;
+    this._measureElement.style.fontFamily = options.fontFamily;
    this._measureElement.style.fontSize = `${options.fontSize}px`;
    const geometry = this._measureElement.getBoundingClientRect();
    // The element is likely currently display:none, we should retain the