phlux/mattermostest
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #545 from yuya-oc/blur-webview-on-deactivation

Browse Source 
Fix desktop notifications not working when the window is minimized from inactive state
This commit is contained in:
Yuya Ochiai
2017-06-06 23:17:15 +09:00
committed by GitHub
parent 020f50f0fc 63497009ec
commit 77e5a7d88a
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@@ -24,6 +24,10 @@ Release date: TBD
- Fixed mis-aligned `+` button of tab bar. - Fixed mis-aligned `+` button of tab bar.
[#541](https://github.com/mattermost/desktop/issues/541) [#541](https://github.com/mattermost/desktop/issues/541)
#### Windows
- Fixed desktop notifications not working when the window has been minimized from inactive state.
[#522](https://github.com/mattermost/desktop/issues/522)
#### Mac #### Mac
- Fixed an issue where the text box didn't keep focus after uploading a file. - Fixed an issue where the text box didn't keep focus after uploading a file.
[#341](https://github.com/mattermost/desktop/issues/341) [#341](https://github.com/mattermost/desktop/issues/341)

1
src/main/mainWindow.js
View File

@@ -77,6 +77,7 @@ function createMainWindow(config, options) {
// Ideally, app should detect that OS is shutting down. // Ideally, app should detect that OS is shutting down.
mainWindow.on('blur', () => { mainWindow.on('blur', () => {
saveWindowState(boundsInfoPath, mainWindow); saveWindowState(boundsInfoPath, mainWindow);
mainWindow.blurWebView();
}); });
mainWindow.on('close', (event) => { mainWindow.on('close', (event) => {