Merge a35cd43 into 6ad6a01

xtermjs · Feb 20, 2019 · c0acd03 · c0acd03
2 parents 6ad6a01 + a35cd43
commit c0acd03
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/Buffer.ts b/src/Buffer.ts
@@ -211,7 +211,7 @@ export class Buffer implements IBuffer {
 
     this.scrollBottom = newRows - 1;
 
-    if (this._hasScrollback) {
+    if (this._isReflowEnabled) {
       this._reflow(newCols, newRows);
 
       // Trim the end of the line off if cols shrunk
@@ -226,6 +226,10 @@ export class Buffer implements IBuffer {
     this._rows = newRows;
   }
 
+  private get _isReflowEnabled(): boolean {
+    return this._hasScrollback && !(this._terminal as any).isWinptyCompatEnabled;
+  }
+
   private _reflow(newCols: number, newRows: number): void {
     if (this._cols === newCols) {
       return;

diff --git a/src/addons/winptyCompat/winptyCompat.ts b/src/addons/winptyCompat/winptyCompat.ts
@@ -19,6 +19,8 @@ export function winptyCompatInit(terminal: Terminal): void {
     return;
   }
 
+  (addonTerminal._core as any).isWinptyCompatEnabled = true;
+
   // Winpty does not support wraparound mode which means that lines will never
   // be marked as wrapped. This causes issues for things like copying a line
   // retaining the wrapped new line characters or if consumers are listening