GuanM/tabby
1
0
Fork 0
mirror of https://github.com/Eugeny/tabby.git synced 2025-06-29 15:59:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

delay frontend init if not focused (fixes #1147, fixes #1137)

Browse Source
This commit is contained in:
Eugene Pankov 2019-07-02 21:28:40 +02:00
parent 1fdf5367b6
commit d6c9ce84ea
2 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
terminus-core/src/components/splitTab.component.ts
View File

@ -189,7 +189,11 @@ export class SplitTabComponent extends BaseTabComponent implements OnInit, OnDes
this.focused$.subscribe(() => {
this.getAllTabs().forEach(x => x.emitFocused())
this.focus(this.focusedTab)
if (this.focusedTab) {
this.focus(this.focusedTab)
} else {
this.focusAnyIn(this.root)
}
})
this.blurred$.subscribe(() => this.getAllTabs().forEach(x => x.emitBlurred()))
@ -235,8 +239,10 @@ export class SplitTabComponent extends BaseTabComponent implements OnInit, OnDes
await this.recoverContainer(this.root, this._recoveredState)
this.layout()
setImmediate(() => {
this.getAllTabs().forEach(x => x.emitFocused())
this.focusAnyIn(this.root)
if (this.hasFocus) {
this.getAllTabs().forEach(x => x.emitFocused())
this.focusAnyIn(this.root)
}
})
}
}

18
terminus-terminal/src/api/baseTerminalTab.component.ts
View File

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