summaryrefslogtreecommitdiff
path: root/electron_js/main.js
diff options
context:
space:
mode:
authorPliable Pixels <pliablepixels@gmail.com>2018-09-09 10:47:55 -0400
committerPliable Pixels <pliablepixels@gmail.com>2018-09-09 10:47:55 -0400
commitfd317367ce221b83137e6198b30159caf4b129ce (patch)
tree3e8aa78f48ce38269ef53cd95897037a17fa44db /electron_js/main.js
parent33025d65e1e79041b8d4f1f4ab830ab9d2ebd667 (diff)
#701 moved to electron-build
Diffstat (limited to 'electron_js/main.js')
-rw-r--r--electron_js/main.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/electron_js/main.js b/electron_js/main.js
index efac0235..9e2a9028 100644
--- a/electron_js/main.js
+++ b/electron_js/main.js
@@ -71,8 +71,10 @@ const mx = globalShortcut.register('CommandOrControl+Alt+F', () => {
y: mainWindowState.y,
width: mainWindowState.width,
height: mainWindowState.height,
+ icon: path.join(__dirname, '/../icon.png'),
webPreferences:{nodeIntegration:false}});
//
+ console.log (__dirname+'/../icon.png');
@@ -149,7 +151,7 @@ const mx = globalShortcut.register('CommandOrControl+Alt+F', () => {
role: 'window',
submenu: [
{role: 'minimize'},
- {role: 'close'}
+ {role: 'quit'}
]
},
{