From 231936c0c720d2dc8d499a281f46d974c8ece3f9 Mon Sep 17 00:00:00 2001 From: booploops <49113086+booploops@users.noreply.github.com> Date: Thu, 17 Feb 2022 22:45:59 -0800 Subject: [PATCH] macOS transparency --- src/main/base/browserwindow.ts | 10 +++++++--- src/renderer/index.js | 2 +- src/renderer/less/macos.less | 17 +++++++++++++++++ src/renderer/style.less | 1 + 4 files changed, 26 insertions(+), 4 deletions(-) create mode 100644 src/renderer/less/macos.less diff --git a/src/main/base/browserwindow.ts b/src/main/base/browserwindow.ts index c4fbcafd..9c89b50f 100644 --- a/src/main/base/browserwindow.ts +++ b/src/main/base/browserwindow.ts @@ -91,11 +91,11 @@ export class BrowserWindow { minHeight: 390, frame: false, title: "Cider", - vibrancy: "fullscreen-ui", + vibrancy: "dark", transparent: process.platform === "darwin", - hasShadow: false, + hasShadow: true, show: false, - //backgroundColor: "#1E1E1E", + // backgroundColor: "#1E1E1E", titleBarStyle: 'hidden', trafficLightPosition: {x: 15, y: 20}, webPreferences: { @@ -130,8 +130,12 @@ export class BrowserWindow { switch(process.platform) { default: + break; + case "win32": + this.options.backgroundColor = "#1E1E1E"; break; case "linux": + this.options.backgroundColor = "#1E1E1E"; this.options.autoHideMenuBar = true this.options.frame = true break; diff --git a/src/renderer/index.js b/src/renderer/index.js index c0b0442d..cc0f3c3b 100644 --- a/src/renderer/index.js +++ b/src/renderer/index.js @@ -452,7 +452,7 @@ const app = new Vue({ history.forward() }, getHTMLStyle() { - document.querySelector("html").style.background = "#222"; + // document.querySelector("html").style.background = "#222"; document.querySelector("body").classList.add("notransparency") }, resetState() { diff --git a/src/renderer/less/macos.less b/src/renderer/less/macos.less new file mode 100644 index 00000000..af21338b --- /dev/null +++ b/src/renderer/less/macos.less @@ -0,0 +1,17 @@ +body[platform="darwin"] { + html { + background: transparent!important; + } + + &.notransparency::before { + display: none; + } + #app { + &.simplebg { + background: transparent; + } + &::before { + display: none; + } + } +} \ No newline at end of file diff --git a/src/renderer/style.less b/src/renderer/style.less index 08813883..6ae9c835 100644 --- a/src/renderer/style.less +++ b/src/renderer/style.less @@ -3110,5 +3110,6 @@ body[platform='darwin'] { } +@import url("less/macos.less"); @import url("less/linux.less"); @import url("less/compact.less");