From 9eed5c04fff403ef6a7d9ad3ca1fe8628510b9a6 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Sat, 22 Feb 2020 17:35:19 +0100 Subject: Switch from electron-webpack to electron-forge --- src/main/index.ts | 44 ++++++++++++-------------------------------- src/renderer/index.html | 11 +++++++++++ 2 files changed, 23 insertions(+), 32 deletions(-) create mode 100644 src/renderer/index.html (limited to 'src') diff --git a/src/main/index.ts b/src/main/index.ts index 3a94ae5..be494a4 100644 --- a/src/main/index.ts +++ b/src/main/index.ts @@ -1,60 +1,40 @@ import { app, BrowserWindow } from 'electron'; -import * as path from 'path'; -import { format as formatUrl } from 'url'; +declare const MAIN_WINDOW_WEBPACK_ENTRY: string; const isDevelopment = process.env.NODE_ENV !== 'production'; -// global reference to mainWindow (necessary to prevent window from being garbage collected) -let mainWindow: BrowserWindow | null = null; +app.allowRendererProcessReuse = true; -function getIndexURL(): string { - if (isDevelopment) { - return `http://localhost:${process.env.ELECTRON_WEBPACK_WDS_PORT}`; - } - - return formatUrl({ - pathname: path.join(__dirname, 'index.html'), - protocol: 'file', - slashes: true, - }); -} - -function createMainWindow(): BrowserWindow { +function createWindow(): void { const window = new BrowserWindow({ webPreferences: { nodeIntegration: true } }); + window.loadURL(MAIN_WINDOW_WEBPACK_ENTRY); + if (isDevelopment) { window.webContents.openDevTools(); } - window.loadURL(getIndexURL()); - - window.on('closed', () => { - mainWindow = null; - }); - window.webContents.on('devtools-opened', () => { window.webContents.focus(); }); - - return window; } // quit application when all windows are closed app.on('window-all-closed', () => { - // on macOS it is common for applications to stay open until the user explicitly quits + // On macOS it is common for applications and their menu bar + // to stay active until the user quits explicitly with Cmd + Q if (process.platform !== 'darwin') { app.quit(); } }); app.on('activate', () => { - // on macOS it is common to re-create a window even after all windows have been closed - if (!mainWindow) { - mainWindow = createMainWindow(); + // On macOS it's common to re-create a window in the app when the + // dock icon is clicked and there are no other windows open. + if (BrowserWindow.getAllWindows().length === 0) { + createWindow(); } }); // create main BrowserWindow when electron is ready -app.on('ready', () => { - mainWindow = createMainWindow(); -}); +app.on('ready', createWindow); diff --git a/src/renderer/index.html b/src/renderer/index.html new file mode 100644 index 0000000..5bd9d1f --- /dev/null +++ b/src/renderer/index.html @@ -0,0 +1,11 @@ + + + + + + RPGedit + + +
+ + -- cgit v1.2.3