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

fixed terminal not getting focus when switching windows (fixes #692)

Browse Source
This commit is contained in:
Eugene Pankov 2019-12-31 23:20:07 +01:00
parent b07a2113d2
commit 21cb452d62
3 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/lib/window.ts
View File

@ -202,6 +202,10 @@ export class Window {
} }
}) })
this.window.on('focus', () => {
this.send('host:window-focused')
})
ipcMain.on('window-focus', event => { ipcMain.on('window-focus', event => {
if (!this.window || event.sender !== this.window.webContents) { if (!this.window || event.sender !== this.window.webContents) {
return return

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

@ -83,6 +83,10 @@ export class AppService {
this.startTabStorage() this.startTabStorage()
} }
} }
hostApp.windowFocused$.subscribe(() => {
this._activeTab?.emitFocused()
})
} }
startTabStorage () { startTabStorage () {

7
terminus-core/src/services/hostApp.service.ts
View File

@ -39,6 +39,7 @@ export class HostAppService {
private configChangeBroadcast = new Subject<void>() private configChangeBroadcast = new Subject<void>()
private windowCloseRequest = new Subject<void>() private windowCloseRequest = new Subject<void>()
private windowMoved = new Subject<void>() private windowMoved = new Subject<void>()
private windowFocused = new Subject<void>()
private displayMetricsChanged = new Subject<void>() private displayMetricsChanged = new Subject<void>()
private logger: Logger private logger: Logger
private windowId: number private windowId: number
@ -85,6 +86,8 @@ export class HostAppService {
get windowMoved$ (): Observable<void> { return this.windowMoved } get windowMoved$ (): Observable<void> { return this.windowMoved }
get windowFocused$ (): Observable<void> { return this.windowFocused }
get displayMetricsChanged$ (): Observable<void> { return this.displayMetricsChanged } get displayMetricsChanged$ (): Observable<void> { return this.displayMetricsChanged }
private constructor ( private constructor (
@ -128,6 +131,10 @@ export class HostAppService {
this.zone.run(() => this.windowMoved.next()) this.zone.run(() => this.windowMoved.next())
}) })
electron.ipcRenderer.on('host:window-focused', () => {
this.zone.run(() => this.windowFocused.next())
})
electron.ipcRenderer.on('host:display-metrics-changed', () => { electron.ipcRenderer.on('host:display-metrics-changed', () => {
this.zone.run(() => this.displayMetricsChanged.next()) this.zone.run(() => this.displayMetricsChanged.next())
}) })