Fix: 色が反映されないバグを修正

sevenc-nanashi · Mar 8, 2023 · c742e8c · c742e8c
1 parent 18c3f89
commit c742e8c
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 16 deletions.
diff --git a/src-electron/main.ts b/src-electron/main.ts
@@ -184,7 +184,7 @@ const createMainWindow = async () => {
   params.append("dirname", __dirname)
   params.append("muted", (store.get("muted", false) as boolean).toString())
   params.append("url", url)
-  if (isDevelopment) {
+  if (isDevelopment || store.get("__open_devtools", false)) {
     win.webContents.openDevTools({ mode: "detach" })
   }
   win.loadURL(`${url}?${params.toString()}`)

diff --git a/src/inject/index.ts b/src/inject/index.ts
@@ -1,7 +1,7 @@
 import { contextBridge, ipcRenderer } from "electron"
 import style from "./style.scss"
-import colorsStyle from "./colors.scss"
-import loginStyle from "./loginStyle.css"
+import colorsStyle from "./colors.scss?inline"
+import loginStyle from "./loginStyle.scss?inline"
 
 import type { CafeMusicInfo } from "./window"
 import { NowPlayingInfo, Playlist, UpdateAvailable } from "^/type/common"
@@ -195,7 +195,12 @@ ipcRenderer.on("set-cyalume-settings", (_event, settings: CyalumeSettings) => {
   document.body.setAttribute("data-kcd-cyalume-dim", settings.dim.toString())
 })
 window.addEventListener("message", (event) => {
-  if (!["http://localhost:5173", "app://."].includes(event.origin)) {
+  if (
+    ![
+      "http://localhost:5173", // Development mode
+      "null", // Production mode, app:// origin is "null"
+    ].includes(event.origin)
+  ) {
     return
   }
   const [type] = event.data

diff --git a/src/inject/loginStyle.css → src/inject/loginStyle.scss b/src/inject/loginStyle.css → src/inject/loginStyle.scss
diff --git a/src/main.ts b/src/main.ts
@@ -46,16 +46,6 @@ const router = createRouter({
   ],
 })
 
-createApp({
-  mounted() {
-    if (window.parent !== window) {
-      window.parent.postMessage(["get-settings"], "*")
-    }
-  },
-})
-  .use(router)
-  .mount("#app")
-
 if (typeof window.electron !== "undefined") {
   window.electron.receive("set-colors", (colors: [string, string][]) => {
     for (const [key, value] of colors) {
@@ -85,6 +75,16 @@ const onMessage = (event: MessageEvent) => {
   }
 }
 
-window.addEventListener("DOMContentLoaded", () => {
+const setupMessages = () => {
   window.addEventListener("message", onMessage)
-})
+  console.log("Loaded, sending get-settings")
+  window.parent.postMessage(["get-settings"], "*")
+}
+
+if (document.readyState === "loading") {
+  document.addEventListener("DOMContentLoaded", setupMessages)
+} else {
+  setupMessages()
+}
+
+createApp({}).use(router).mount("#app")