diff --git a/main.js b/main.js index e20d669..05d6a14 100644 --- a/main.js +++ b/main.js @@ -4,7 +4,11 @@ const path = require("path"); const contextMenu = require("electron-context-menu"); const os = require("os"); require("v8-compile-cache"); - +if (require("./utils/ArmCord.js").Titlebar === "native") { + var frame = true +} else { + var frame = false +} if (os.type() == 'Linux'){ var iconformat = __dirname + "/discord.png" @@ -31,7 +35,7 @@ function createWindow() { height: 600, icon: iconformat, title: "ArmCord", - frame: false, + frame: frame, webPreferences: { preload: path.join(__dirname, "preload.js"), enableRemoteModule: true, diff --git a/preload.js b/preload.js index e036e65..f6f29a4 100644 --- a/preload.js +++ b/preload.js @@ -5,10 +5,11 @@ const electronLocalshortcut = require("electron-localshortcut"); const ArmCord = require("./utils/ArmCord.js"); require("./utils/theme.js"); window.addEventListener("DOMContentLoaded", () => { + if (require("./utils/ArmCord.js").Titlebar === "native") {console.log("Using native titlebar")} else { new customTitlebar.Titlebar({ backgroundColor: customTitlebar.Color.fromHex("#202225"), menu: false, - }); + });} electronLocalshortcut.register(currentWindow, "F5", () => { location.reload(); diff --git a/utils/ArmCord.js b/utils/ArmCord.js index 097cc55..69e18cf 100644 --- a/utils/ArmCord.js +++ b/utils/ArmCord.js @@ -10,7 +10,7 @@ if (!fs.existsSync(settingsFile)) { console.log("Created settings.json file"); } exports.Channel = require(settingsFile).channel; - +exports.Titlebar = require(settingsFile).titlebar; exports.addStyle = function(styleString) { const style = document.createElement('style'); style.textContent = styleString;