summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--electron_js/main.js14
-rwxr-xr-xmake_desktop.sh5
-rw-r--r--package.json1
3 files changed, 19 insertions, 1 deletions
diff --git a/electron_js/main.js b/electron_js/main.js
index 2e6941cf..7f3a955b 100644
--- a/electron_js/main.js
+++ b/electron_js/main.js
@@ -1,4 +1,5 @@
const electron = require('electron');
+const windowStateKeeper = require('electron-window-state');
//require('electron-debug')({showDevTools: true});
// Module to control application life.
const {app} = electron;
@@ -26,8 +27,19 @@ if (shouldQuit) {
function createWindow() {
// Create the browser window.
- win = new BrowserWindow({width: 1024, height: 900, webPreferences:{nodeIntegration:false}});
+ let mainWindowState = windowStateKeeper({
+ defaultWidth: 1000,
+ defaultHeight: 800
+ });
+ //win = new BrowserWindow({width: 1024, height: 900, webPreferences:{nodeIntegration:false}});
+ win = new BrowserWindow({
+ x: mainWindowState.x,
+ y: mainWindowState.y,
+ width: mainWindowState.width,
+ height: mainWindowState.height,
+ webPreferences:{nodeIntegration:false}});
+ mainWindowState.manage(win);
// fs will be arg 1 if its not run in electron debug mode
if (process.argv.slice(1)=='fs' || process.argv.slice(2)=='fs')
win.setFullScreen(true);
diff --git a/make_desktop.sh b/make_desktop.sh
index ef05219c..9353843d 100755
--- a/make_desktop.sh
+++ b/make_desktop.sh
@@ -24,6 +24,11 @@ if [ -d "$i" ]; then
echo "------------------------------------------------------------------------"
exe rm -fr $i/app
exe mkdir $i/app
+ exe mkdir $i/app/node_modules
+ exe cp -R node_modules/electron-window-state $i/app/node_modules
+ exe cp -R node_modules/jsonfile $i/app/node_modules
+ exe cp -R node_modules/mkdirp $i/app/node_modules
+ exe cp -R node_modules/deep-equal $i/app/node_modules
exe cp -R www/* $i/app/
exe cp electron_js/* $i/app
exe cp www/ZMNINJA-LICENSE-DESKTOP-CLIENT.txt ../$DIRNAME
diff --git a/package.json b/package.json
index f6f0113e..e6b8eac3 100644
--- a/package.json
+++ b/package.json
@@ -11,6 +11,7 @@
"@angular/platform-browser-dynamic": "^2.0.0-rc.3",
"@angular/router": "^2.0.0-rc.2",
"async": "^1.4.2",
+ "electron-window-state": "^4.0.2",
"gulp": "^3.5.6",
"gulp-concat": "^2.2.0",
"gulp-minify-css": "^0.3.0",