feat: 支持给BrowserWindow传递初始化参数

BalloonUpdate · Dec 7, 2021 · 01d6f51 · 01d6f51
1 parent 6bd25af
commit 01d6f51
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 19 deletions.
diff --git a/src/main/Updater.ts b/src/main/Updater.ts
@@ -45,12 +45,17 @@ export class Updater
             this.printEnvironment()
 
             // 初始化窗口
-            // 加载默认窗口宽高
-            let winWidth = this.readField('window_width', 'number', 400)
-            let winHeight = this.readField('window_height', 'number', 300)
-            let frameless = this.readField('frameless', 'boolean', false)
-            let transparent = this.readField('transparent', 'boolean', false)
-            await this.uwin.create(winWidth, winHeight, frameless, transparent)
+            await this.uwin.create({
+                width: this.readField('window_width', 'number', 400), 
+                height: this.readField('window_height', 'number', 300), 
+                frame: !this.readField('frameless', 'boolean', false), 
+                transparent: this.readField('transparent', 'boolean', false),
+                webPreferences: {
+                    nodeIntegration: true,
+                    contextIsolation: false
+                },
+                ...this.readField('window_config', 'object', {})
+            })
 
             // 加载图标
             let iconpath = this.readField('icon', 'string')

diff --git a/src/main/UpdaterWindow.ts b/src/main/UpdaterWindow.ts
@@ -40,11 +40,11 @@ export class UpdaterWindow
         })
     }
 
-    async create(width: number, height: number, frameless: boolean, transparent: boolean): Promise<void>
+    async create(configs: any): Promise<void>
     {
         await new Promise((a, b) => {
             let cre = () => {
-                this.createWindow(width, height, frameless, transparent)
+                this.createWindow(configs)
                 a(undefined)    
             }
 
@@ -123,18 +123,9 @@ export class UpdaterWindow
         })
     }
 
-    private createWindow(width: number, height: number, frameless: boolean, transparent: boolean)
+    private createWindow(configs: any)
     {
-        this.win = new BrowserWindow({
-            width: width,
-            height: height,
-            frame: !frameless,
-            transparent: transparent,
-            webPreferences: {
-                nodeIntegration: true,
-                contextIsolation: false
-            }
-        })
+        this.win = new BrowserWindow(configs)
 
         if(app.isPackaged)
             this.win.setMenuBarVisibility(false)