Eugeny/tabby
1
1
Fork 0
mirror of https://github.com/Eugeny/tabby.git synced 2024-11-28 05:36:31 +03:00
Code Issues Projects Releases Wiki Activity

properly recover tabs with xterm

Browse Source
This commit is contained in:
Eugene Pankov 2019-01-27 22:01:55 +01:00
parent fab21f6859
commit 792de65696
4 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
terminus-core/src/services/app.service.ts
View File

@ -105,7 +105,9 @@ export class AppService {
this.activeTab = tab
this.activeTabChange.next(tab)
if (this.activeTab) {
this.activeTab.emitFocused()
setImmediate(() => {
this.activeTab.emitFocused()
})
this.hostApp.setTitle(this.activeTab.title)
}
}

2
terminus-plugin-manager/src/components/pluginsSettingsTab.component.pug
View File

@ -65,7 +65,7 @@ div(*ngIf='npmInstalled')
.input-group.mb-3
.input-group-prepend
.input-group-text
i.fas.fa-fw.fa-circle-o-notch.fa-spin(*ngIf='!availablePluginsReady')
i.fas.fa-fw.fa-circle-notch.fa-spin(*ngIf='!availablePluginsReady')
i.fas.fa-fw.fa-search(*ngIf='availablePluginsReady')
input.form-control(
type='text',

10
terminus-terminal/src/components/baseTerminalTab.component.ts
View File

@ -145,7 +145,15 @@ export class BaseTerminalTabComponent extends BaseTabComponent implements OnInit
})
this.frontend.configure()
this.frontend.attach(this.content.nativeElement)
if (this.hasFocus) {
this.frontend.attach(this.content.nativeElement)
} else {
this.focused$.pipe(first()).subscribe(() => {
this.frontend.attach(this.content.nativeElement)
})
}
this.attachTermContainerHandlers()
this.configure()

9
terminus-terminal/src/frontends/xtermFrontend.ts
View File

@ -54,6 +54,14 @@ export class XTermFrontend extends Frontend {
this.xtermCore._scrollToBottom = this.xtermCore.scrollToBottom.bind(this.xtermCore)
this.xtermCore.scrollToBottom = () => null
this.resizeHandler = () => {
try {
(this.xterm as any).fit()
} catch {
// tends to throw when element wasn't shown yet
}
}
}
attach (host: HTMLElement): void {
@ -61,7 +69,6 @@ export class XTermFrontend extends Frontend {
this.ready.next(null)
this.ready.complete()
this.resizeHandler = () => (this.xterm as any).fit()
window.addEventListener('resize', this.resizeHandler)
this.resizeHandler()