fix(cli.js): .ico icon generation, closes #2692 (#2694)

* fix(cli.js): `.ico` icon generation, closes #2692 * fmt * chore: cleanup resize logic
tauri-apps · Oct 2, 2021 · 11db96e · 11db96e
1 parent 45573ae
commit 11db96e
Show file tree

Hide file tree

Showing 5 changed files with 556 additions and 14 deletions.
diff --git a/.changes/cli.js-fix-ico.md b/.changes/cli.js-fix-ico.md
@@ -0,0 +1,5 @@
+---
+"cli.js": patch
+---
+
+Fixes `.ico` icon generation.
diff --git a/tooling/api/src/window.ts b/tooling/api/src/window.ts
@@ -861,12 +861,12 @@ class WindowManager extends WebviewWindowHandle {
             type: 'setMinSize',
             payload: size
               ? {
-                type: size.type,
-                data: {
-                  width: size.width,
-                  height: size.height
+                  type: size.type,
+                  data: {
+                    width: size.width,
+                    height: size.height
+                  }
                 }
-              }
               : null
           }
         }
@@ -903,12 +903,12 @@ class WindowManager extends WebviewWindowHandle {
             type: 'setMaxSize',
             payload: size
               ? {
-                type: size.type,
-                data: {
-                  width: size.width,
-                  height: size.height
+                  type: size.type,
+                  data: {
+                    width: size.width,
+                    height: size.height
+                  }
                 }
-              }
               : null
           }
         }

diff --git a/tooling/cli.js/package.json b/tooling/cli.js/package.json
@@ -64,6 +64,7 @@
     "is-png": "3.0.1",
     "minimist": "1.2.5",
     "ms": "2.1.3",
+    "png-to-ico": "2.1.2",
     "png2icons": "2.0.1",
     "read-chunk": "4.0.2",
     "semver": "7.3.5",

diff --git a/tooling/cli.js/src/api/tauricon.ts b/tooling/cli.js/src/api/tauricon.ts
@@ -39,6 +39,8 @@ const { access, ensureDir, ensureFileSync, writeFileSync } = fsExtra.default
 const require = createRequire(import.meta.url)
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const { version } = require('../../package.json')
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const pngToIco = require('png-to-ico')
 
 const log = logger('app:spawn')
 const warn = logger('app:spawn', chalk.red)
@@ -498,8 +500,16 @@ const tauricon = {
       }
       await this.validate(src, target)
 
-      const sharpSrc = sharp(src)
-      const buf = await sharpSrc.toBuffer()
+      const s = sharp(src)
+      const metadata = await s.metadata()
+      const buf = await s.toBuffer()
+      let icoBuf
+      if (metadata.width !== metadata.height) {
+        const size = Math.min(metadata.width ?? 256, metadata.height ?? 256)
+        icoBuf = await s.resize(size, size).toBuffer()
+      } else {
+        icoBuf = await s.toBuffer()
+      }
 
       const out = png2icons.createICNS(buf, png2icons.BICUBIC, 0)
       if (out === null) {
@@ -508,7 +518,7 @@ const tauricon = {
       ensureFileSync(path.join(target, '/icon.icns'))
       writeFileSync(path.join(target, '/icon.icns'), out)
 
-      const out2 = png2icons.createICO(buf, png2icons.BICUBIC, 0, true)
+      const out2 = await pngToIco(icoBuf)
       if (out2 === null) {
         throw new Error('Failed to create icon.ico')
       }