Skip to content

Commit

Permalink
Update Electron to 1.6.10
Browse files Browse the repository at this point in the history
- Desktop notification for Windows 7
- Per-monitor DPI awareness
  • Loading branch information
yuya-oc committed May 31, 2017
1 parent 481bf96 commit 854ed8a
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 15 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@ Release date: TBD

### Improvements

#### Windows
- [Windows 7/8] Added support to open the message when clicking desktop notification.
[#67](https://github.com/mattermost/desktop/issues/67)
- Added support for different DPI across monitors.
[#357](https://github.com/mattermost/desktop/issues/357)

### Bug Fixes

---
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"cross-env": "^4.0.0",
"css-loader": "^0.28.1",
"devtron": "^1.4.0",
"electron": "1.6.6",
"electron": "1.6.10",
"electron-builder": "17.4.0",
"electron-builder-squirrel-windows": "17.4.0",
"electron-connect": "^0.6.1",
Expand Down
14 changes: 0 additions & 14 deletions src/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ const os = require('os');
const path = require('path');

var settings = require('./common/settings');
const osVersion = require('./common/osVersion');
var certificateStore = require('./main/certificateStore').load(path.resolve(app.getPath('userData'), 'certificate.json'));
const {createMainWindow} = require('./main/mainWindow');
const appMenu = require('./main/menus/app');
Expand Down Expand Up @@ -428,19 +427,6 @@ app.on('ready', () => {

mainWindow.focus();
});
ipcMain.on('notified', (event, arg) => {
if (process.platform === 'win32') {
// On Windows 8.1 and Windows 8, a shortcut with a Application User Model ID must be installed to the Start screen.
// In current version, use tray balloon for notification
if (osVersion.isLowerThanOrEqualWindows8_1()) {
trayIcon.displayBalloon({
icon: path.resolve(assetsDir, 'appicon.png'),
title: arg.title,
content: arg.options.body
});
}
}
});

// Set overlay icon from dataURL
// Set trayicon to show "dot"
Expand Down

0 comments on commit 854ed8a

Please sign in to comment.