From ce49dd9dae65ef0938ac76f010d6f4c0231ff528 Mon Sep 17 00:00:00 2001 From: Eugene Pankov Date: Tue, 16 Jul 2019 23:29:56 +0200 Subject: [PATCH] potential fix for #729 --- terminus-terminal/src/frontends/xtermFrontend.ts | 4 +++- terminus-terminal/yarn.lock | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/terminus-terminal/src/frontends/xtermFrontend.ts b/terminus-terminal/src/frontends/xtermFrontend.ts index d889c442..a6cb2909 100644 --- a/terminus-terminal/src/frontends/xtermFrontend.ts +++ b/terminus-terminal/src/frontends/xtermFrontend.ts @@ -85,7 +85,9 @@ export class XTermFrontend extends Frontend { this.resizeHandler = () => { try { - this.fitAddon.fit() + if (getComputedStyle(this.xtermCore.element).getPropertyValue('height') !== 'auto') { + this.fitAddon.fit() + } } catch (e) { // tends to throw when element wasn't shown yet console.warn('Could not resize xterm', e) diff --git a/terminus-terminal/yarn.lock b/terminus-terminal/yarn.lock index b7d78153..edb46f7d 100644 --- a/terminus-terminal/yarn.lock +++ b/terminus-terminal/yarn.lock @@ -166,9 +166,9 @@ uuid@^3.3.2: integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA== xterm-addon-fit@^0.1.0-beta3: - version "0.1.0-beta3" - resolved "https://registry.yarnpkg.com/xterm-addon-fit/-/xterm-addon-fit-0.1.0-beta3.tgz#82bc2474cb00a2872d9a43ea52ed801bdfeebeaf" - integrity sha512-5UWwCH3smDWlqskK8r0GcCgLPvwbJiPpKiM01E67g5HIrQqCxITKawc01cuKCDLVj03sFJB9jDCOoh0n0mN+Zw== + version "0.1.0" + resolved "https://registry.yarnpkg.com/xterm-addon-fit/-/xterm-addon-fit-0.1.0.tgz#dd52d8b2ec6ef05faab8285bafd9310063704468" + integrity sha512-DzYThnR5rXYX7JrOZ8rHGMU36BiTwYNFUOhhNwrDSFvoUR2MgwQrfA/JrqLE62KRj0D8bkRR7+xe7qGBp1O4Rw== xterm-addon-ligatures@^0.1.0-beta-2: version "0.1.0-beta-2"