Fix new window issue on linux

FreeterApp · Apr 14, 2024 · f0f5108 · f0f5108
1 parent 7cbd2da
commit f0f5108
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 8 deletions.
diff --git a/src/main/index.ts b/src/main/index.ts
@@ -213,6 +213,13 @@ if (!app.requestSingleInstanceLock()) {
         }
       )
 
+      app.on('browser-window-created', (_e, win) => {
+        // Disable menu in child windows
+        if (win !== appWindow) {
+          win.removeMenu();
+        }
+      });
+
       initTrayUseCase(appWindow);
     })
   });

diff --git a/src/main/infra/browserWindow/browserWindow.ts b/src/main/infra/browserWindow/browserWindow.ts
@@ -126,14 +126,24 @@ export function createRendererWindow(
         parent: win,
         title: 'Freeter',
       }
-      if (process.platform === 'win32') {
-        browserWinOpts = {
-          ...browserWinOpts,
-          frame: false,
-          thickFrame: true,
-          modal: true,
-          titleBarOverlay: true,
-          titleBarStyle: 'hidden'
+      switch (process.platform) {
+        case 'linux': {
+          browserWinOpts = {
+            ...browserWinOpts,
+            modal: true,
+          }
+          break;
+        }
+        case 'win32': {
+          browserWinOpts = {
+            ...browserWinOpts,
+            frame: false,
+            thickFrame: true,
+            modal: true,
+            titleBarOverlay: true,
+            titleBarStyle: 'hidden'
+          }
+          break;
         }
       }
       return {