diff --git a/modules/discord_desktop_core/core/app/mainScreen.js b/modules/discord_desktop_core/core/app/mainScreen.js index a404747..abc6266 100644 --- a/modules/discord_desktop_core/core/app/mainScreen.js +++ b/modules/discord_desktop_core/core/app/mainScreen.js @@ -377,11 +377,9 @@ function launchMainAppWindow(isVisible) { mainWindowId = mainWindow.id; global.mainWindowId = mainWindowId; if(settings.get("GLASSTRON", true)){ - glasstron.update(mainWindow, { - windows: {blurType: 'blurbehind'}, - macos: {vibrancy: 'fullscreen-ui'}, - linux: {requestBlur: true} // KWin - }); + mainWindow.blurType = settings.get("GLASSTRON_BLUR", "blurbehind") + mainWindow.setVibrancy("fullscreen-ui") + mainWindow.setBlur(true) } mainWindow.webContents.session.webRequest.onHeadersReceived(function(details, callback) { diff --git a/package-lock.json b/package-lock.json index fa88e8a..1534fae 100644 --- a/package-lock.json +++ b/package-lock.json @@ -591,10 +591,11 @@ } }, "glasstron": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/glasstron/-/glasstron-0.0.3.tgz", - "integrity": "sha512-yJ8+8gkGXXBlnI+4j6i8N+SaeZcswtrO82M863zQkCc5BQfC5fTXcwj9+v80f0jYUfZLFigsgaFuKoFmlVsOdw==", + "version": "0.0.4", + "resolved": "https://registry.npmjs.org/glasstron/-/glasstron-0.0.4.tgz", + "integrity": "sha512-FgM0mkCRqbzyZq+eru6ulXKRi/wCKbglyEhGB2L2B3Aaq7nf9GkvV+X9fpwha8yxEv95/T7dllzvozQZ+fPPrg==", "requires": { + "node-addon-api": "^3.0.0", "x11": "^2.3.0" } }, @@ -869,6 +870,11 @@ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "dev": true }, + "node-addon-api": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.0.0.tgz", + "integrity": "sha512-sSHCgWfJ+Lui/u+0msF3oyCgvdkhxDbkCS6Q8uiJquzOimkJBvX6hl5aSSA7DR1XbMpdM8r7phjcF63sF4rkKg==" + }, "node-fetch": { "version": "2.6.0", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz", diff --git a/package.json b/package.json index 7be214d..53992cc 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "dependencies": { "auto-launch": "^5.0.5", "custom-electron-titlebar": "^3.2.2-hotfix62", - "glasstron": "0.0.3", + "glasstron": "0.0.4", "mkdirp": "^1.0.4", "node-fetch": "^2.6.0", "request": "^2.88.2", diff --git a/src/index.ts b/src/index.ts index 6f3beae..1af0e73 100644 --- a/src/index.ts +++ b/src/index.ts @@ -3,10 +3,7 @@ import appSettings from "./appSettings"; let settings = appSettings.getSettings(); /** Glasstron */ -if (settings.get("GLASSTRON", true)) { - const glasstron = require("glasstron"); - glasstron.init(); -} +if (settings.get("GLASSTRON", true))require("glasstron"); /** Modules */ import * as electron from "electron"; @@ -37,6 +34,7 @@ electron.app.commandLine.appendSwitch( "no-user-gesture-required" ); electron.app.commandLine.appendSwitch("no-force-async-hooks-checks"); +electron.app.commandLine.appendSwitch("enable-transparent-visuals"); function setupHardwareAcceleration() { const settings = appSettings.getSettings(); @@ -96,7 +94,6 @@ function hasArgvFlag(flag) { releaseChannel: ${buildInfo.releaseChannel} commit: ${buildInfo.commit}`); - if (!electron.app.commandLine.hasSwitch("enable-transparent-visuals"))electron.app.commandLine.appendSwitch("enable-transparent-visuals"); electron.app.setAppUserModelId(Constants.APP_ID);