Merge branch 'upcoming' of https://github.com/ciderapp/Cider into upcoming

2022-01-22 21:53:46 -08:00 · 2022-01-22 21:53:46 -08:00 · 9117b1ad6e
commit 9117b1ad6e
parent aa83f2d747 669d9c5e46
7 changed files with 570 additions and 1 deletions
--- a/src/main/base/win.ts
+++ b/src/main/base/win.ts
@ -406,6 +406,13 @@ export class Win {
            this.win.webContents.setZoomFactor(parseFloat(scale));
        });

+        // Set scale
+        electron.ipcMain.on("windowresize", (event, width, height, lock = false) => {          
+            this.win.setMinimumSize(300,300);
+            this.win.setContentSize(width, height);
+            this.win.setResizable(!lock);
+        });
+
        //Fullscreen
        electron.ipcMain.on('setFullScreen', (event, flag) => {
            this.win.setFullScreen(flag)