diff options
-rw-r--r-- | CHANGELOG.md | 4 | ||||
-rw-r--r-- | src/index.js | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index e5085cda9..e69db8440 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md | |||
@@ -2,6 +2,10 @@ | |||
2 | 2 | ||
3 | - Add a confirmation dialog and a preference while quitting Ferdi (#1879) 💖 @vraravam | 3 | - Add a confirmation dialog and a preference while quitting Ferdi (#1879) 💖 @vraravam |
4 | 4 | ||
5 | ### Bug Fixes | ||
6 | |||
7 | - Fix macOS black screen when closing to systray in fullscreen mode (#1878) 💖 @sad270 | ||
8 | |||
5 | # [v5.6.1-nightly.52](https://github.com/getferdi/ferdi/compare/v5.6.1-nightly.51...v5.6.1-nightly.52) (2021-09-07) | 9 | # [v5.6.1-nightly.52](https://github.com/getferdi/ferdi/compare/v5.6.1-nightly.51...v5.6.1-nightly.52) (2021-09-07) |
6 | 10 | ||
7 | ### Bug Fixes | 11 | ### Bug Fixes |
diff --git a/src/index.js b/src/index.js index d2b0f56f4..55f58bb56 100644 --- a/src/index.js +++ b/src/index.js | |||
@@ -280,6 +280,11 @@ const createWindow = () => { | |||
280 | debug('Skip taskbar: true'); | 280 | debug('Skip taskbar: true'); |
281 | mainWindow.setSkipTaskbar(true); | 281 | mainWindow.setSkipTaskbar(true); |
282 | } | 282 | } |
283 | } else if (isMac && mainWindow.isFullScreen()) { | ||
284 | debug('Window: leaveFullScreen and hide'); | ||
285 | mainWindow.once('show', () => mainWindow.setFullScreen(true)); | ||
286 | mainWindow.once('leave-full-screen', () => mainWindow.hide()); | ||
287 | mainWindow.setFullScreen(false); | ||
283 | } else { | 288 | } else { |
284 | debug('Window: hide'); | 289 | debug('Window: hide'); |
285 | mainWindow.hide(); | 290 | mainWindow.hide(); |