adapt macOS 26 menu icon (#295)

eagleoflqj · web-flow · commit 6385a6d99574 · 2025-09-19T01:22:22.000-04:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -94,6 +94,10 @@ jobs:
       - name: Check validity
         run: |
           ./scripts/check-validity.sh
+
+      - name: Check reproducibility
+        if: ${{ matrix.arch == 'arm64' && matrix.type == 'Release' }}
+        run: |
           md5sum -c checksum
 
       # TODO: remove all meta.json stuff after 2026-03-02
diff --git a/assets/CMakeLists.txt b/assets/CMakeLists.txt
@@ -5,14 +5,28 @@ install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/fcitx.icns"
 )
 
 add_custom_command(
-    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/menu_icon.pdf
-    COMMAND SOURCE_DATE_EPOCH=0 rsvg-convert -f pdf -o ${CMAKE_CURRENT_BINARY_DIR}/menu_icon.pdf ${CMAKE_CURRENT_SOURCE_DIR}/penguin.svg
-    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/penguin.svg
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/menu_icon_26.pdf
+    COMMAND SOURCE_DATE_EPOCH=0 rsvg-convert -f pdf -o ${CMAKE_CURRENT_BINARY_DIR}/menu_icon_26.pdf ${CMAKE_CURRENT_SOURCE_DIR}/penguin-26.svg
+    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/penguin-26.svg
+)
+add_custom_command(
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/menu_icon_15.pdf
+    COMMAND SOURCE_DATE_EPOCH=0 rsvg-convert -f pdf -o ${CMAKE_CURRENT_BINARY_DIR}/menu_icon_15.pdf ${CMAKE_CURRENT_SOURCE_DIR}/penguin-15.svg
+    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/penguin-15.svg
 )
 add_custom_target(GeneratePDF ALL
-    DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/menu_icon.pdf
+    DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/menu_icon_26.pdf ${CMAKE_CURRENT_BINARY_DIR}/menu_icon_15.pdf
+)
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/menu_icon_26.pdf"
+    DESTINATION "${CMAKE_INSTALL_PREFIX}/Resources"
+)
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/menu_icon_15.pdf"
+    DESTINATION "${CMAKE_INSTALL_PREFIX}/Resources"
 )
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/menu_icon.pdf"
+# When upgrade from old version, menu_icon.pdf will be used, so we have to make it the old version.
+# Afterwards, script will copy the correct one to overwrite it.
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/menu_icon_15.pdf"
+    RENAME menu_icon.pdf
     DESTINATION "${CMAKE_INSTALL_PREFIX}/Resources"
 )
 
diff --git a/assets/penguin-15.svg b/assets/penguin-15.svg
diff --git a/assets/penguin-26.svg b/assets/penguin-26.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="29" height="21">
+  <path
+    d="M 7,0 a 7 7 0 0 0 -7 7 v 7 a 7 7 0 0 0 7 7 h 15 a 7 7 0 0 0 7 -7 V 7 a 7 7 0 0 0 -7 -7 Z M 11,8 c 0,-2.5 2,-4 4,-4 c 2,0 3.4,1.2 4,3 c 0.3,0.9 1,1.3 2,1.5 -1,0.2 -2,1 -2,2 v 2.5 c 0,2.5 -2,4 -4,4 h -8 c 2.5,-0.5 4,-3 4,-5 z m 3,0 a 1.5 1.5 0 0 0 1.5 1.5 a 1.5 1.5 0 0 0 1.5 -1.5 a 1.5 1.5 0 0 0 -1.5 -1.5 a 1.5 1.5 0 0 0 -1.5 1.5 z"
+    style="fill:#000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1" />
+</svg>
diff --git a/assets/update.sh b/assets/update.sh
@@ -14,6 +14,14 @@ if ls "$APP_DIR"/Contents/MacOS/Fcitx5.*; then # Debug symbols
 fi
 tar xjvf "$tar_ball" -C "$INSTALL_DIR"
 rm -f "$tar_ball"
+
+major_version=$(sw_vers -productVersion | cut -d. -f1)
+if (( major_version >= 26 )); then
+  cp "$RESOURCES_DIR/menu_icon_26.pdf" "$RESOURCES_DIR/menu_icon.pdf"
+else
+  cp "$RESOURCES_DIR/menu_icon_15.pdf" "$RESOURCES_DIR/menu_icon.pdf"
+fi
+
 xattr -dr com.apple.quarantine "$APP_DIR"
 codesign --force --sign - --deep "$APP_DIR"
 
diff --git a/checksum b/checksum
@@ -1 +1,2 @@
-812db98c6fe5e485daa12a15bfd98538  build/assets/menu_icon.pdf
+a8649eaeb642417ae3beed3ad5c9885c  build/arm64/assets/menu_icon_15.pdf
+b023a2b068e7dae81e9c06c7f0132db0  build/arm64/assets/menu_icon_26.pdf

Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`		`-812db98c6fe5e485daa12a15bfd98538 build/assets/menu_icon.pdf`
	`1`	`+a8649eaeb642417ae3beed3ad5c9885c build/arm64/assets/menu_icon_15.pdf`
	`2`	`+b023a2b068e7dae81e9c06c7f0132db0 build/arm64/assets/menu_icon_26.pdf`