Skip to content

Commit 6287942

Browse files
committed
fix: full screen mode no traffic light #663
1 parent 389dc08 commit 6287942

File tree

2 files changed

+30
-2
lines changed

2 files changed

+30
-2
lines changed

Diff for: src/main/Application.js

+22-2
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,16 @@ import TouchBarManager from './ui/TouchBarManager'
2121
import TrayManager from './ui/TrayManager'
2222
import DockManager from './ui/DockManager'
2323
import ThemeManager from './ui/ThemeManager'
24-
import { AUTO_SYNC_TRACKER_INTERVAL, AUTO_CHECK_UPDATE_INTERVAL } from '@shared/constants'
24+
import {
25+
APP_RUN_MODE,
26+
AUTO_SYNC_TRACKER_INTERVAL,
27+
AUTO_CHECK_UPDATE_INTERVAL
28+
} from '@shared/constants'
2529
import { checkIsNeedRun } from '@shared/utils'
26-
import { convertTrackerDataToComma, fetchBtTrackerFromSource } from '@shared/utils/tracker'
30+
import {
31+
convertTrackerDataToComma,
32+
fetchBtTrackerFromSource
33+
} from '@shared/utils/tracker'
2734

2835
export default class Application extends EventEmitter {
2936
constructor () {
@@ -280,12 +287,25 @@ export default class Application extends EventEmitter {
280287
this.windowManager.on('window-resized', (data) => {
281288
this.storeWindowState(data)
282289
})
290+
283291
this.windowManager.on('window-moved', (data) => {
284292
this.storeWindowState(data)
285293
})
294+
286295
this.windowManager.on('window-closed', (data) => {
287296
this.storeWindowState(data)
288297
})
298+
299+
this.windowManager.on('enter-full-screen', (window) => {
300+
this.dockManager.show()
301+
})
302+
303+
this.windowManager.on('leave-full-screen', (window) => {
304+
const mode = this.configManager.getUserConfig('run-mode')
305+
if (mode !== APP_RUN_MODE.STANDARD) {
306+
this.dockManager.hide()
307+
}
308+
})
289309
}
290310

291311
storeWindowState (data = {}) {

Diff for: src/main/ui/WindowManager.js

+8
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,14 @@ export default class WindowManager extends EventEmitter {
105105
}
106106
})
107107

108+
window.on('enter-full-screen', () => {
109+
this.emit('enter-full-screen', window)
110+
})
111+
112+
window.on('leave-full-screen', () => {
113+
this.emit('leave-full-screen', window)
114+
})
115+
108116
this.handleWindowState(page, window)
109117

110118
this.handleWindowClose(pageOptions, page, window)

0 commit comments

Comments
 (0)