From 3696ebdba9e8390534684b366c56f0f694b8cf40 Mon Sep 17 00:00:00 2001 From: kz-n <64893077+kz-n@users.noreply.github.com> Date: Wed, 12 Oct 2022 21:35:32 +0200 Subject: [PATCH] Add dynamic vibe import only on windows (#227) --- src/utils.ts | 11 ++++++----- src/window.ts | 11 ++++++----- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/utils.ts b/src/utils.ts index 75ab334..4714af5 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -1,7 +1,6 @@ import * as fs from "fs"; import {app, dialog} from "electron"; import path from "path"; -import vibe from "@pyke/vibe"; export var firstRun: boolean; export var contentPath: string; export var transparency: boolean; @@ -120,10 +119,12 @@ export async function injectElectronFlags() { default: console.log("No performance modes set"); } - if ((await getConfig("windowStyle")) == "transparent") { - console.log("Transparent mode enabled"); - vibe.setup(app); - transparency = true; + if ((await getConfig("windowStyle")) == "transparent" && process.platform === "win32") { + import("@pyke/vibe").then(vibe => { + console.log("Transparent mode enabled"); + vibe.setup(app); + transparency = true; + }); } } export async function setLang(language: string) { diff --git a/src/window.ts b/src/window.ts index e19eef0..c645afa 100644 --- a/src/window.ts +++ b/src/window.ts @@ -21,7 +21,6 @@ import startServer from "./socket"; import contextMenu from "electron-context-menu"; import os from "os"; import {tray} from "./tray"; -import vibe from "@pyke/vibe"; import {iconPath} from "./main"; export let mainWindow: BrowserWindow; export let inviteWindow: BrowserWindow; @@ -51,10 +50,12 @@ contextMenu({ ] }); async function doAfterDefiningTheWindow() { - if (transparency) { - vibe.applyEffect(mainWindow, "acrylic"); - vibe.setDarkMode(mainWindow); - mainWindow.show(); + if (transparency && process.platform === "win32") { + import("@pyke/vibe").then(vibe => { + vibe.applyEffect(mainWindow, "acrylic"); + vibe.setDarkMode(mainWindow); + mainWindow.show(); + }); } var ignoreProtocolWarning = await getConfig("ignoreProtocolWarning"); await checkIfConfigIsBroken();