fixed transparency bug with progress window

z-edit · Aug 27, 2021 · fba8990 · fba8990
1 parent bc3b33e
commit fba8990
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/src/javascripts/main.js b/src/javascripts/main.js
@@ -12,7 +12,11 @@ global.env = require('./env');
 global.argv = process.argv;
 
 let mainWindow, progressWindow, showProgressTimeout, lastProgressMessage;
-let webPreferences = { nodeIntegration: true, contextIsolation: false, enableRemoteModule: true };
+let baseWebPreferences = {
+    nodeIntegration: true,
+    contextIsolation: false,
+    enableRemoteModule: true
+};
 
 let logger = new Logger();
 logger.init('main');
@@ -76,8 +80,10 @@ let openMainWindow = function() {
     mainWindow = createWindow('main', {
         frame: false,
         show: false,
-        backgroundColor: '#555',
-        webPreferences
+        webPreferences: {
+            ...baseWebPreferences,
+            backgroundColor: '#555'
+        }
     });
     logger.info('Main window created');
     logger.info('Loading application...');
@@ -95,7 +101,7 @@ let openProgressWindow = function() {
     let t = !process.argv.includes('--disable-transparency'),
         debugProgress = process.argv.includes('--debug-progress');
     logger.info(`Window transparency is ${t ? 'en' : 'dis'}abled`);
-    logger.info(`Progress window is${debugProgress ? ' ' : ' not '}modal`);
+    logger.info(`Progress window is${debugProgress ? ' not ' : ' '}modal`);
     logger.info('Creating progress window...');
 
     let progressWindowOptions = {
@@ -110,7 +116,7 @@ let openProgressWindow = function() {
         minimizable: debugProgress,
         resizable: debugProgress,
         movabale: debugProgress,
-        webPreferences: {nodeIntegration: true}
+        webPreferences: { ...baseWebPreferences }
     };
     if (debugProgress) {
         progressWindowOptions.width = 900;