Merge pull request #286 from rao-pics/284-cmd+q-覆盖掉了其他的菜单事件

fix: 🐛 cmd+q-覆盖掉了其他的菜单事件
meetqy · Jun 29, 2023 · f233098 · f233098
2 parents 47f7c48 + b033cb7
commit f233098
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/apps/electron/main/index.ts b/apps/electron/main/index.ts
@@ -23,6 +23,13 @@ createAllIPCHandler();
  */
 createMenu();
 
+/**
+ * Hide dock
+ */
+if (process.platform === "darwin") {
+  app.dock.hide();
+}
+
 let nextjsWebChild: cp.ChildProcess | undefined;
 
 /**
@@ -68,11 +75,6 @@ app.on("quit", () => {
   }
 });
 
-/** Hide dock */
-if (process.platform === "darwin") {
-  app.dock.hide();
-}
-
 /**
  * @see https://www.electronjs.org/docs/latest/api/app#event-activate-macos Event: 'activate'.
  */

diff --git a/apps/electron/main/src/menu.ts b/apps/electron/main/src/menu.ts
@@ -10,6 +10,14 @@ const createMenu = () => {
     {
       label: app.name,
       submenu: [
+        { role: "about" },
+        { type: "separator" },
+        { role: "services" },
+        { type: "separator" },
+        { role: "hide" },
+        { role: "hideOthers" },
+        { role: "unhide" },
+        { type: "separator" },
         {
           label: "Quit",
           accelerator: "CmdOrCtrl+Q",
@@ -21,6 +29,9 @@ const createMenu = () => {
         },
       ],
     },
+    { role: "editMenu" },
+    { role: "viewMenu" },
+    { role: "windowMenu" },
   ]);
   Menu.setApplicationMenu(menu);
 };