From 7ff814cfdafd7aefee8eae414a28058e8bd3e0a6 Mon Sep 17 00:00:00 2001 From: booploops <49113086+booploops@users.noreply.github.com> Date: Thu, 3 Feb 2022 20:10:26 -0800 Subject: [PATCH 1/3] added -webkit-app-region: drag; to chrome--left --- src/renderer/style.less | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/renderer/style.less b/src/renderer/style.less index f5713b50..87d68942 100644 --- a/src/renderer/style.less +++ b/src/renderer/style.less @@ -876,6 +876,7 @@ input[type=range].web-slider::-webkit-slider-runnable-track { .app-chrome .app-chrome--left { width: 30%; justify-content: left; + -webkit-app-region: drag; } .app-chrome .app-chrome--center { @@ -5961,6 +5962,7 @@ body[platform='darwin'] { .app-chrome .app-chrome-item > .app-mainmenu { opacity: 0; pointer-events: none; + -webkit-app-region: drag; } } From a96b601ccd4a262cd962f25b47a8d6f256956e9f Mon Sep 17 00:00:00 2001 From: Core <64542347+coredev-uk@users.noreply.github.com> Date: Fri, 4 Feb 2022 04:11:44 +0000 Subject: [PATCH 2/3] button pos update --- src/main/base/browserwindow.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/base/browserwindow.ts b/src/main/base/browserwindow.ts index 04faf2bc..8e5940ea 100644 --- a/src/main/base/browserwindow.ts +++ b/src/main/base/browserwindow.ts @@ -46,8 +46,8 @@ export class BrowserWindow { hasShadow: false, show: false, backgroundColor: "#1E1E1E", - titleBarStyle: 'customButtonsOnHover', - trafficLightPosition: {x: 960, y: 20}, + titleBarStyle: 'hidden', + trafficLightPosition: {x: 15, y: 20}, webPreferences: { nodeIntegration: true, sandbox: true, From e97a2f35d44709717846fd4461456bc482c9d68d Mon Sep 17 00:00:00 2001 From: Core <64542347+coredev-uk@users.noreply.github.com> Date: Fri, 4 Feb 2022 04:14:38 +0000 Subject: [PATCH 3/3] Removed the platform check as mac no longer calls it --- src/main/base/browserwindow.ts | 9 +++------ src/renderer/views/main.ejs | 14 +++++++------- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/src/main/base/browserwindow.ts b/src/main/base/browserwindow.ts index 04faf2bc..ad617046 100644 --- a/src/main/base/browserwindow.ts +++ b/src/main/base/browserwindow.ts @@ -440,13 +440,11 @@ export class BrowserWindow { return await search(u); }); - ipcMain.on("close", (_event, platformCheck) => { - if (platformCheck && process.platform === "darwin") return + ipcMain.on("close", (_event) => { BrowserWindow.win.close(); }); - ipcMain.on("maximize", (_event, platformCheck) => { - if (platformCheck && process.platform === "darwin") return + ipcMain.on("maximize", (_event) => { // listen for maximize event if (BrowserWindow.win.isMaximized()) { BrowserWindow.win.unmaximize(); @@ -459,8 +457,7 @@ export class BrowserWindow { BrowserWindow.win.unmaximize(); }); - ipcMain.on("minimize", (_event, platformCheck) => { - if (platformCheck && process.platform === "darwin") return + ipcMain.on("minimize", () => { // listen for minimize event BrowserWindow.win.minimize(); }); diff --git a/src/renderer/views/main.ejs b/src/renderer/views/main.ejs index cf6adea2..44258400 100644 --- a/src/renderer/views/main.ejs +++ b/src/renderer/views/main.ejs @@ -42,12 +42,12 @@