diff --git a/src/main/base/browserwindow.ts b/src/main/base/browserwindow.ts index f83d9450..d606d3f6 100644 --- a/src/main/base/browserwindow.ts +++ b/src/main/base/browserwindow.ts @@ -41,11 +41,13 @@ export class BrowserWindow { minHeight: 390, frame: false, title: "Cider", - vibrancy: "dark", + vibrancy: "fullscreen-ui", transparent: process.platform === "darwin", hasShadow: false, show: false, backgroundColor: "#1E1E1E", + titleBarStyle: 'customButtonsOnHover', + trafficLightPosition: { x: 960, y: 20 }, webPreferences: { nodeIntegration: true, sandbox: true, @@ -383,11 +385,13 @@ export class BrowserWindow { return await yt.search(u); }); - ipcMain.on("close", () => { + ipcMain.on("close", (_event, mac) => { + if (mac) return BrowserWindow.win.close(); }); - ipcMain.on("maximize", () => { + ipcMain.on("maximize", (_event, mac) => { + if (mac) return // listen for maximize event if (BrowserWindow.win.isMaximized()) { BrowserWindow.win.unmaximize(); @@ -400,7 +404,8 @@ export class BrowserWindow { BrowserWindow.win.unmaximize(); }); - ipcMain.on("minimize", () => { + ipcMain.on("minimize", (_event, mac) => { + if (mac) return // listen for minimize event BrowserWindow.win.minimize(); }); diff --git a/src/renderer/style.less b/src/renderer/style.less index 457d270c..b396c8cc 100644 --- a/src/renderer/style.less +++ b/src/renderer/style.less @@ -1072,7 +1072,7 @@ input[type=range].web-slider::-webkit-slider-runnable-track { body[platform="darwin"] .app-chrome .app-chrome-item > .window-controls > div.minimize { height: 12px; width: 12px; - background-color: rgb(0, 202, 86); + background-color: rgb(255, 92, 92); border-radius: 50%; display: inline-block; margin: auto 4px; @@ -1099,7 +1099,7 @@ body[platform="darwin"] .app-chrome .app-chrome-item > .window-controls > div.mi body[platform="darwin"] .app-chrome .app-chrome-item > .window-controls > div.close { height: 12px; width: 12px; - background-color: rgb(255, 92, 92); + background-color: rgb(0, 202, 86); border-radius: 50%; display: inline-block; margin: auto 4px auto 4px; diff --git a/src/renderer/views/main.ejs b/src/renderer/views/main.ejs index 69408e2e..7517b412 100644 --- a/src/renderer/views/main.ejs +++ b/src/renderer/views/main.ejs @@ -41,12 +41,12 @@