Skip to content

Commit

Permalink
fix: full screen mode no traffic light agalwood#663
Browse files Browse the repository at this point in the history
  • Loading branch information
agalwood authored and myg133 committed Jun 16, 2020
1 parent ac57162 commit 5600ba2
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 2 deletions.
24 changes: 22 additions & 2 deletions src/main/Application.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,16 @@ import TouchBarManager from './ui/TouchBarManager'
import TrayManager from './ui/TrayManager'
import DockManager from './ui/DockManager'
import ThemeManager from './ui/ThemeManager'
import { AUTO_SYNC_TRACKER_INTERVAL, AUTO_CHECK_UPDATE_INTERVAL } from '@shared/constants'
import {
APP_RUN_MODE,
AUTO_SYNC_TRACKER_INTERVAL,
AUTO_CHECK_UPDATE_INTERVAL
} from '@shared/constants'
import { checkIsNeedRun } from '@shared/utils'
import { convertTrackerDataToComma, fetchBtTrackerFromSource } from '@shared/utils/tracker'
import {
convertTrackerDataToComma,
fetchBtTrackerFromSource
} from '@shared/utils/tracker'

export default class Application extends EventEmitter {
constructor () {
Expand Down Expand Up @@ -280,12 +287,25 @@ export default class Application extends EventEmitter {
this.windowManager.on('window-resized', (data) => {
this.storeWindowState(data)
})

this.windowManager.on('window-moved', (data) => {
this.storeWindowState(data)
})

this.windowManager.on('window-closed', (data) => {
this.storeWindowState(data)
})

this.windowManager.on('enter-full-screen', (window) => {
this.dockManager.show()
})

this.windowManager.on('leave-full-screen', (window) => {
const mode = this.configManager.getUserConfig('run-mode')
if (mode !== APP_RUN_MODE.STANDARD) {
this.dockManager.hide()
}
})
}

storeWindowState (data = {}) {
Expand Down
8 changes: 8 additions & 0 deletions src/main/ui/WindowManager.js
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,14 @@ export default class WindowManager extends EventEmitter {
}
})

window.on('enter-full-screen', () => {
this.emit('enter-full-screen', window)
})

window.on('leave-full-screen', () => {
this.emit('leave-full-screen', window)
})

this.handleWindowState(page, window)

this.handleWindowClose(pageOptions, page, window)
Expand Down

0 comments on commit 5600ba2

Please sign in to comment.