From 365aba0e01d120a86e14d66d38390ba4220fb5df Mon Sep 17 00:00:00 2001 From: Jean Ouina Date: Fri, 22 May 2020 18:43:03 +0200 Subject: [PATCH] Added always on top option --- BetterDiscordApp/src/0globals.js | 29 +++++++++++-------- BetterDiscordApp/src/modules/settingsPanel.js | 7 ++++- .../src/modules/settingsPanelSidebar.js | 4 +-- 3 files changed, 25 insertions(+), 15 deletions(-) diff --git a/BetterDiscordApp/src/0globals.js b/BetterDiscordApp/src/0globals.js index 176547d..f1e37e1 100644 --- a/BetterDiscordApp/src/0globals.js +++ b/BetterDiscordApp/src/0globals.js @@ -54,9 +54,12 @@ export const settings = { "React DevTools": {id: "reactDevTools", info: "Adds react developer tools to the devtools. Must be installed in Google Chrome on your pc.", implemented: true, hidden: true, cat: "core", category: "developer settings"}, /** LightCord */ - "Disable BetterDiscord": {id: "bd-disable", info: "Disable Betterdiscord (plugins, themes, etc).", implemented: true, hidden: false, cat: "lightcord", category: "Lightcord"}, + "Disable BetterDiscord": {id: "bd-disable", info: "Disable Betterdiscord (plugins, themes, etc).", implemented: false, hidden: false, cat: "lightcord", category: "Lightcord"}, "Calling Ring Beat": {id: "lightcord-2", info: "Enable Discord's special calling beat.", implemented: true, hidden: false, cat: "lightcord", category: "Lightcord"}, - "Developer Mode": {id: "lightcord-1", info: "Enable Discord's Internal Developer Options. This allow the \"Experiments\" tab and the \"Developer Options\" tab. (must close and reopen settings)", implemented: true, hidden: false, cat: "lightcord", category: "Lightcord"}, + "Developer Options": {id: "lightcord-1", info: "Enable Discord's Internal Developer Options. This allow the \"Experiments\" tab and the \"Developer Options\" tab. (must close and reopen settings)", implemented: true, hidden: false, cat: "lightcord", category: "Lightcord"}, + + /** Lightcord Window */ + "Always-on-Top": {id: "lightcord-3", info: "Enable window's Always-on-Top mode, where Lightcord stays on top of other applications.", implemented: true, hidden: false, cat: "lightcord", category: "Window"}, /** RichPresence */ "Enable": {id: "lightcord-presence-1", info: "Enable RichPresence below.", implemented: true, hidden: false, cat: "status"} @@ -97,7 +100,9 @@ export const defaultCookie = { "reactDevTools": false, "lightcord-1": false, "lightcord-2": true, - "lightcord-presence-1": false + "lightcord-presence-1": false, + "lightcord-3": false, + "lightcord-4": true }; @@ -105,13 +110,14 @@ export const settingsCookie = {}; export const settingsRPC = {}; export const defaultRPC = { - name: "Lightcord", - application_id: "711416957718757418", - type: 0, - details: "Browsing Discord", - state: "Lightcord", - "timestamps.start": Date.now() -}; + "name": "Lightcord", + "application_id": "711416957718757418", + "state": "Lightcord Client", + "details": "Browsing Discord", + "timestamps.start": Date.now(), + "assets.small": null, + "assets.large": "712323821037682791" +} export const bdpluginErrors = []; export const bdthemeErrors = []; // define for backwards compatibility @@ -122,5 +128,4 @@ export const bdthemes = {}; export const bdplugins = {}; export const pluginCookie = {}; -export const themeCookie = {}; - +export const themeCookie = {}; \ No newline at end of file diff --git a/BetterDiscordApp/src/modules/settingsPanel.js b/BetterDiscordApp/src/modules/settingsPanel.js index 27b48b0..062c0fa 100644 --- a/BetterDiscordApp/src/modules/settingsPanel.js +++ b/BetterDiscordApp/src/modules/settingsPanel.js @@ -24,6 +24,7 @@ import CardList from "../ui/addonlist"; import V2C_PresenceSettings from "../ui/presenceSettings"; import CustomRichPresence from "./CustomRichPresence"; import V2C_AccountInfos from "../ui/AccountInfos"; +import { remote } from "electron"; export default new class V2_SettingsPanel { @@ -211,11 +212,14 @@ export default new class V2_SettingsPanel { if (enabled) window.Lightcord.Settings.callRingingBeat = true else window.Lightcord.Settings.callRingingBeat = false } - if (id === "lightcord-presence-1") { if (enabled) CustomRichPresence.enable() else CustomRichPresence.disable() } + if (id === "lightcord-3") { + if (enabled) remote.getCurrentWindow().setAlwaysOnTop(true) + else remote.getCurrentWindow().setAlwaysOnTop(false) + } this.saveSettings(); } @@ -233,6 +237,7 @@ export default new class V2_SettingsPanel { if (settingsCookie["lightcord-1"]) window.Lightcord.Settings.devMode = true if (settingsCookie["lightcord-2"]) window.Lightcord.Settings.callRingingBeat = true if (settingsCookie["lightcord-presence-1"]) CustomRichPresence.enable() + if (settingsCookie["lightcord-3"]) remote.getCurrentWindow().setAlwaysOnTop(true) if (settingsCookie["fork-ps-5"]) { ContentManager.watchContent("plugin"); diff --git a/BetterDiscordApp/src/modules/settingsPanelSidebar.js b/BetterDiscordApp/src/modules/settingsPanelSidebar.js index ae5be40..3fe7f8a 100644 --- a/BetterDiscordApp/src/modules/settingsPanelSidebar.js +++ b/BetterDiscordApp/src/modules/settingsPanelSidebar.js @@ -32,10 +32,10 @@ export default class V2_SettingsPanel_Sidebar { }, { text: "RichPresence", id: "status" - }, { + }, /*{ text: "Message Logger", id: "msglog" - }, { + }, */{ text: "Account Info", id: "accountinfo" }];