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

Merge branch 'master' into release/v1.1.0

Browse Source
This commit is contained in:
Yuya Ochiai
2016-03-22 23:24:04 +09:00
parent 960c5782bd ef8eebc8d0
commit ab18e33f7f
25 changed files with 229 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main.js
View File

@@ -50,9 +50,6 @@ var mainWindow = null;
var trayIcon = null;
var willAppQuit = false;
// For toast notification on windows
app.setAppUserModelId('yuya-oc.electron-mattermost');
// Quit when all windows are closed.
app.on('window-all-closed', function() {
// On OS X it is common for applications and their menu bar
@@ -166,7 +163,9 @@ app.on('ready', function() {
// follow Electron's defaults
window_options = {};
}
window_options.icon = path.resolve(__dirname, 'resources/appicon.png');
if (process.platform === 'linux') {
window_options.icon = path.resolve(__dirname, 'resources/appicon.png');
}
window_options.fullScreenable = true;
mainWindow = new BrowserWindow(window_options);
mainWindow.setFullScreenable(true); // fullscreenable option has no effect.