From fb6eb1465c44ee2ace0124c59300683df203ebe7 Mon Sep 17 00:00:00 2001 From: Daniel Imms Date: Wed, 27 Jun 2018 14:58:29 -0700 Subject: [PATCH] Ensure maximumDimensions have changes before firing onDidChangeMaximumDimensions Fixes #52916 --- src/vs/workbench/api/node/extHostTerminalService.ts | 3 +++ .../parts/terminal/electron-browser/terminalInstance.ts | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/vs/workbench/api/node/extHostTerminalService.ts b/src/vs/workbench/api/node/extHostTerminalService.ts index f67e95e5a75..2f677bef140 100644 --- a/src/vs/workbench/api/node/extHostTerminalService.ts +++ b/src/vs/workbench/api/node/extHostTerminalService.ts @@ -214,6 +214,9 @@ export class ExtHostTerminalRenderer extends BaseExtHostTerminal implements vsco } public _setMaximumDimensions(columns: number, rows: number): void { + if (this._maximumDimensions && this._maximumDimensions.columns === columns && this._maximumDimensions.rows === rows) { + return; + } this._maximumDimensions = { columns, rows }; this._onDidChangeMaximumDimensions.fire(this.maximumDimensions); } diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts index 6d9978c6211..1a73d38dbd7 100644 --- a/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts +++ b/src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts @@ -963,7 +963,7 @@ export class TerminalInstance implements ITerminalInstance { this._safeSetOption('drawBoldTextInBrightColors', config.drawBoldTextInBrightColors); } - if (cols !== this._xterm.getOption('cols') || rows !== this._xterm.getOption('rows')) { + if (cols !== this._xterm.cols || rows !== this._xterm.rows) { this._onDimensionsChanged.fire(); } -- GitLab