Update Electron to 1.6.10
- Desktop notification for Windows 7 - Per-monitor DPI awareness
This commit is contained in:
parent
857a2c0314
commit
2b15012358
|
@ -46,7 +46,7 @@
|
||||||
"chai": "^3.5.0",
|
"chai": "^3.5.0",
|
||||||
"cross-env": "^3.1.4",
|
"cross-env": "^3.1.4",
|
||||||
"devtron": "^1.4.0",
|
"devtron": "^1.4.0",
|
||||||
"electron": "1.6.2",
|
"electron": "1.6.10",
|
||||||
"electron-builder": "^14.5.3",
|
"electron-builder": "^14.5.3",
|
||||||
"electron-builder-squirrel-windows": "^15.0.0",
|
"electron-builder-squirrel-windows": "^15.0.0",
|
||||||
"electron-connect": "^0.6.1",
|
"electron-connect": "^0.6.1",
|
||||||
|
|
14
src/main.js
14
src/main.js
|
@ -56,7 +56,6 @@ const os = require('os');
|
||||||
const path = require('path');
|
const path = require('path');
|
||||||
|
|
||||||
var settings = require('./common/settings');
|
var settings = require('./common/settings');
|
||||||
const osVersion = require('./common/osVersion');
|
|
||||||
var certificateStore = require('./main/certificateStore').load(path.resolve(app.getPath('userData'), 'certificate.json'));
|
var certificateStore = require('./main/certificateStore').load(path.resolve(app.getPath('userData'), 'certificate.json'));
|
||||||
const {createMainWindow} = require('./main/mainWindow');
|
const {createMainWindow} = require('./main/mainWindow');
|
||||||
const appMenu = require('./main/menus/app');
|
const appMenu = require('./main/menus/app');
|
||||||
|
@ -428,19 +427,6 @@ app.on('ready', () => {
|
||||||
|
|
||||||
mainWindow.focus();
|
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 overlay icon from dataURL
|
||||||
// Set trayicon to show "dot"
|
// Set trayicon to show "dot"
|
||||||
|
|
Loading…
Reference in a new issue