Preload settings/theme in Settings window

xanderfrangos · Aug 30, 2022 · 5aa2adb · 5aa2adb
1 parent 006625b
commit 5aa2adb
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/src/electron.js b/src/electron.js
@@ -2559,7 +2559,9 @@ function createSettings() {
       webSecurity: false,
       additionalArguments: ["jsVars" + Buffer.from(JSON.stringify({
         appName: app.name,
-        appVersion: app.getVersion()
+        appVersion: app.getVersion(),
+        settings,
+        lastTheme
       })).toString('base64')]
     }
   });

diff --git a/src/settings-preload.js b/src/settings-preload.js
@@ -165,8 +165,7 @@ ipc.on('localization-updated', (event, localization) => {
     }))
 })
 
-// User personalization settings recieved
-ipc.on('theme-settings', (event, theme) => {
+const processTheme = (event, theme) => {
     try {
         window.document.body.dataset["systemTheme"] = (theme.SystemUsesLightTheme == 0 ? "dark" : "light")
         window.document.body.dataset["transparent"] = (theme.EnableTransparency == 0 || theme.UseAcrylic == 0 ? "false" : "true")
@@ -185,7 +184,10 @@ ipc.on('theme-settings', (event, theme) => {
         window.document.body.dataset["acrylic"] = false
         window.document.body.dataset["coloredTaskbar"] = "false"
     }
-})
+}
+
+// User personalization settings recieved
+ipc.on('theme-settings', processTheme)
 
 ipc.on('mica-wallpaper', (event, wallpaper) => {
     const mica = document.querySelector("#mica .displays")
@@ -202,6 +204,7 @@ ipc.on('mica-wallpaper', (event, wallpaper) => {
 
 // Request startup data
 window.addEventListener("DOMContentLoaded", () => {
+    processTheme(undefined, getArgumentVars().lastTheme)
     requestSettings()
     requestMonitors()
     requestAccent()
@@ -225,7 +228,7 @@ window.openURL = openURL
 window.allMonitors = []
 window.lastUpdate = Date.now()
 window.showPanel = false
-window.settings = {}
+window.settings = getArgumentVars().settings
 window.thisWindow = browser
 window.accent = "cyan"