diff --git a/Makefile b/Makefile index ae7d981..351a647 100644 --- a/Makefile +++ b/Makefile @@ -124,8 +124,8 @@ $(eval $(call svg2png,Scratch\ Link\ Safari\ Helper/Scratch\ Link\ Safari\ Exten # See also: # https://stackoverflow.com/q/3236115 # https://iconhandbook.co.uk/reference/chart/windows/ -$(eval $(call svg2ico,scratch-link-win/scratch-link.ico,Assets/square.svg,16 24 32 48 64 96 128 256 512)) -$(eval $(call svg2ico,scratch-link-win/scratch-link-tray.ico,Assets/simplified.svg,16 24 32 48 64 96 128 256 512)) +$(eval $(call svg2ico,scratch-link-win/scratch-link.ico,Assets/square.svg,256 128 96 64 48 32 24 16)) +$(eval $(call svg2ico,scratch-link-win/scratch-link-tray.ico,Assets/simplified.svg,256 128 96 64 48 32 24 16)) # Windows MSIX # TODO: does Microsoft really want DPI=72 for all of these? diff --git a/scratch-link-win/scratch-link-tray.ico b/scratch-link-win/scratch-link-tray.ico index 6ff26eb..73ae1dc 100644 Binary files a/scratch-link-win/scratch-link-tray.ico and b/scratch-link-win/scratch-link-tray.ico differ diff --git a/scratch-link-win/scratch-link.ico b/scratch-link-win/scratch-link.ico index eae6967..42da3ac 100644 Binary files a/scratch-link-win/scratch-link.ico and b/scratch-link-win/scratch-link.ico differ diff --git a/svg-convert.sh b/svg-convert.sh index e043121..026cd64 100644 --- a/svg-convert.sh +++ b/svg-convert.sh @@ -10,6 +10,8 @@ usage () { echo " The resulting PNG is optimized using optipng" echo "ICO conversion:" echo " Assumes each desired size is square" + echo " Sizes above 256 may not be supported" + echo " List sizes in decreasing order to make sure the largest suitable icon size is used in every context" echo " Repeats PNG conversion once per desired size, then glues the results together into an ICO file" echo " PNG optimizations are performed in parallel so progress reporting will likely be garbled" } @@ -45,7 +47,7 @@ svg2ico () { OUTPUT_ICO="$1" shift SVG2ICO_TMP=$(mktemp -d -t svg2ico-XXXXXXXXXX) - trap 'echo "Cleaning up..." >&2; rm -rv "${SVG2ICO_TMP}"; exit' ERR EXIT HUP INT TERM + trap 'echo "Cleaning up..." >&2; rm -rv "${SVG2ICO_TMP}"; exit' EXIT HUP INT TERM ICO_PNGS=() for SIZE in "$@"; do ICO_PNG="${SVG2ICO_TMP}/icon-${SIZE}.png"