fix windows icons

Alex313031 · May 17, 2024 · 124081d · 124081d
1 parent 5153d25
commit 124081d
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 7 deletions.
diff --git a/assets/desktop.ico b/assets/desktop.ico
diff --git a/assets/desktop.png b/assets/desktop.png
diff --git a/assets/icon.png b/assets/icon.png
diff --git a/build/icon.png b/build/icon.png
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/common/config.ts b/src/common/config.ts
@@ -127,6 +127,7 @@ export async function checkIfConfigIsBroken(): Promise<void> {
 export function setup(): void {
     console.log("Setting up temporary ArmCord settings.");
     const isLinux = process.platform === "linux";
+    const isWin = process.platform === "win32";
     const defaults: Settings = {
         windowStyle: isLinux ? "native" : "default",
         channel: "stable",
@@ -150,7 +151,9 @@ export function setup(): void {
         trayIcon: "default",
         doneSetup: false,
         clientName: "ArmCord",
-        customIcon: path.join(__dirname, "../", "/assets/desktop.png")
+        customIcon: isWin
+            ? path.join(__dirname, "../", "/assets/desktop.ico")
+            : path.join(__dirname, "../", "/assets/desktop.png")
     };
     setConfigBulk({
         ...defaults

diff --git a/src/main.ts b/src/main.ts
@@ -69,7 +69,7 @@ if (!app.requestSingleInstanceLock() && getConfigSync("multiInstance") == (false
         app.commandLine.appendSwitch("enable-features", "WebRTCPipeWireCapturer");
         console.log("Wayland detected, using PipeWire for video capture.");
     }
-    // work around chrome 66 disabling autoplay by default
+    // work around chromium 66 disabling autoplay by default
     app.commandLine.appendSwitch("autoplay-policy", "no-user-gesture-required");
     // WinRetrieveSuggestionsOnlyOnDemand: Work around electron 13 bug w/ async spellchecking on Windows.
     // HardwareMediaKeyHandling,MediaSessionService: Prevent Discord from registering as a media service.
@@ -85,6 +85,8 @@ if (!app.requestSingleInstanceLock() && getConfigSync("multiInstance") == (false
     app.whenReady().then(async () => {
         if ((await getConfig("customIcon")) !== undefined ?? null) {
             iconPath = await getConfig("customIcon");
+        } else if (process.platform === "win32") {
+            iconPath = path.join(__dirname, "../", "/assets/desktop.ico");
         } else {
             iconPath = path.join(__dirname, "../", "/assets/desktop.png");
         }

diff --git a/src/setup/setup.html b/src/setup/setup.html
@@ -127,15 +127,15 @@
                         "linuxNotice"
                     ).innerHTML = `Linux may not work well with tray icons. Depending on your system configuration, you may not be able to see the tray icon. Enable at your own risk. Can be changed later.`;
                 }
-                let useNativeLinux;
+                let windowStyleDefault;
                 if (window.armcordinternal.getOS == "linux") {
-                    useNativeLinux = "native";
+                    windowStyleDefault = "native";
                 } else {
-                    useNativeLinux = "default";
+                    windowStyleDefault = "default";
                 }
                 document.getElementById("next-page4").addEventListener("click", () => {
                     window.armcordinternal.saveSettings({
-                        windowStyle: useNativeLinux,
+                        windowStyle: windowStyleDefault,
                         channel: options.channel,
                         armcordCSP: true,
                         minimizeToTray: true,