fix: 修改macos窗口按钮和icon显示

Author: wood3n

electron/main.ts

@@ -1,4 +1,4 @@
-import { app, BrowserWindow, nativeImage } from "electron";
+import { app, BrowserWindow } from "electron";
 import isDev from "electron-is-dev";
 import log from "electron-log";
 import path from "node:path";
@@ -24,7 +24,10 @@ let mainWindow: BrowserWindow | null;
 function createWindow() {
   mainWindow = new BrowserWindow({
     title: "Biu",
-    icon: path.resolve(IconBase, ELECTRON_ICON_BASE_PATH, process.platform === "win32" ? "logo.ico" : "logo.icns"),
+    icon:
+      process.platform === "darwin"
+        ? undefined
+        : path.resolve(IconBase, ELECTRON_ICON_BASE_PATH, process.platform === "win32" ? "logo.ico" : "logo.png"),
     show: true,
     hasShadow: true,
     width: 1200,
@@ -52,7 +55,7 @@ function createWindow() {
           },
         }
       : {}),
-    trafficLightPosition: { x: 0, y: 0 },
+    trafficLightPosition: { x: 16, y: 18 },
     webPreferences: {
       preload: path.join(__dirname, "preload.cjs"),
       webSecurity: true,
@@ -74,12 +77,6 @@ function createWindow() {
     event.preventDefault();
   });
 
-  // MAC dock icon
-  if (process.platform === "darwin") {
-    const dockIcon = nativeImage.createFromPath(path.resolve(IconBase, ELECTRON_ICON_BASE_PATH, "logo.png"));
-    app.dock?.setIcon(dockIcon);
-  }
-
   const indexPath = path.resolve(__dirname, "../dist/web/index.html");
   mainWindow.loadFile(indexPath);
   if (isDev) {

src/layout/side/index.tsx

@@ -1,4 +1,5 @@
 import { Card } from "@heroui/react";
+import { twMerge } from "tailwind-merge";
 
 import { ReactComponent as Logo } from "@/assets/icons/logo.svg";
 import ScrollContainer from "@/components/scroll-container";
@@ -7,9 +8,16 @@ import Collection from "./collection";
 import Menu from "./menu";
 
 const SideNav = () => {
+  const isMac = window.electron?.getPlatform() === "macos";
+
   return (
     <Card radius="none" shadow="none" className="flex h-full flex-none flex-col md:w-[220px]">
-      <div className="window-drag text-primary flex flex-none items-center space-x-2 px-7 py-4">
+      <div
+        className={twMerge(
+          "window-drag text-primary flex flex-none items-center space-x-2 px-7 py-4",
+          isMac && "pt-12",
+        )}
+      >
         <Logo className="h-10 w-10" />
         <span className="text-3xl leading-none font-bold">Biu</span>
       </div>