Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.
TypeScript agentaiai-agentsall-in-onecrmcrm-systememaillinearmcpmessagingnotesnotionofficerustslackslack-alternativestartupstartup-toolstypescriptworkspace
fix(desktop): use mobile artwork for macOS app icon (#8051)
Eric Hayes7a64123a688f
diff --git a/apps/web/tauri/src-tauri/README.md b/apps/web/tauri/src-tauri/README.mdindex 0d4326554f..1d27bcaf4c 100644--- a/apps/web/tauri/src-tauri/README.md+++ b/apps/web/tauri/src-tauri/README.md@@ -5,6 +5,25 @@ single Vite build that runs identically for web, desktop, iOS, and Android — tplatform is detected at runtime via `getPlatform()` rather than baked into thebundle.+## macOS app icon++The macOS icon reuses the iOS marketing artwork through the Icon Composer source+in `icons/macos/Macro.icon`. The macOS-only Tauri configuration bundles its+compiled `Assets.car` and `Macro.icns`, and merges the generated icon names into+Info.plist. Tahoe uses the icon composition; older macOS uses the generated+fallback. The mobile artwork has no baked-in rounded tile or transparent border+for macOS to place inside another enclosure.++After changing the mobile artwork or composition, regenerate with Xcode 26.2:++```sh+bash icons/macos/regenerate.sh+```++Commit the source and generated files together. They are checked in so desktop+release builds do not need Icon Composer. Verify Finder and Dock rendering at+both 1× and 2× display scale on Tahoe, and on a pre-Tahoe Mac.+## Running in development```shdiff --git a/apps/web/tauri/src-tauri/icons/macos/Assets.car b/apps/web/tauri/src-tauri/icons/macos/Assets.carnew file mode 100644index 0000000000..9b39e3ddddBinary files /dev/null and b/apps/web/tauri/src-tauri/icons/macos/Assets.car differdiff --git a/apps/web/tauri/src-tauri/icons/macos/Info.plist b/apps/web/tauri/src-tauri/icons/macos/Info.plistnew file mode 100644index 0000000000..e85b8b7e31--- /dev/null+++ b/apps/web/tauri/src-tauri/icons/macos/Info.plist@@ -0,0 +1,10 @@+<?xml version="1.0" encoding="UTF-8"?>+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">+<plist version="1.0">+<dict>+ <key>CFBundleIconFile</key>+ <string>Macro</string>+ <key>CFBundleIconName</key>+ <string>Macro</string>+</dict>+</plist>diff --git a/apps/web/tauri/src-tauri/icons/macos/Macro.icns b/apps/web/tauri/src-tauri/icons/macos/Macro.icnsnew file mode 100644index 0000000000..065f748359Binary files /dev/null and b/apps/web/tauri/src-tauri/icons/macos/Macro.icns differdiff --git a/apps/web/tauri/src-tauri/icons/macos/Macro.icon/Assets/mobile.png b/apps/web/tauri/src-tauri/icons/macos/Macro.icon/Assets/mobile.pngnew file mode 100644index 0000000000..0d0d84efb2Binary files /dev/null and b/apps/web/tauri/src-tauri/icons/macos/Macro.icon/Assets/mobile.png differdiff --git a/apps/web/tauri/src-tauri/icons/macos/Macro.icon/icon.json b/apps/web/tauri/src-tauri/icons/macos/Macro.icon/icon.jsonnew file mode 100644index 0000000000..ab5db7366b--- /dev/null+++ b/apps/web/tauri/src-tauri/icons/macos/Macro.icon/icon.json@@ -0,0 +1,29 @@+{+ "fill": {+ "solid": "srgb:0.00000,0.00000,0.00000,1.00000"+ },+ "groups": [+ {+ "layers": [+ {+ "glass": false,+ "image-name": "mobile.png",+ "name": "Mobile artwork"+ }+ ],+ "shadow": {+ "kind": "neutral",+ "opacity": 0+ },+ "translucency": {+ "enabled": false,+ "value": 0+ }+ }+ ],+ "supported-platforms": {+ "squares": [+ "macOS"+ ]+ }+}diff --git a/apps/web/tauri/src-tauri/icons/macos/regenerate.sh b/apps/web/tauri/src-tauri/icons/macos/regenerate.shnew file mode 100644index 0000000000..00da2e5644--- /dev/null+++ b/apps/web/tauri/src-tauri/icons/macos/regenerate.sh@@ -0,0 +1,19 @@+#!/bin/bash+set -euo pipefail++icon_dir="$(\cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)"+output_dir="$(mktemp -d)"+trap 'rm -rf "$output_dir"' EXIT++# Keep the desktop composition identical to the mobile marketing artwork.+cp "$icon_dir/../../gen/apple/Assets.xcassets/AppIcon.appiconset/[email protected]" \+ "$icon_dir/Macro.icon/Assets/mobile.png"+xcrun actool "$icon_dir/Macro.icon" \+ --compile "$output_dir" \+ --platform macosx \+ --minimum-deployment-target 10.13 \+ --app-icon Macro \+ --output-partial-info-plist "$output_dir/Info.plist" \+ --output-format human-readable-text++cp "$output_dir/Assets.car" "$output_dir/Macro.icns" "$output_dir/Info.plist" "$icon_dir/"diff --git a/apps/web/tauri/src-tauri/tauri.macos.conf.json b/apps/web/tauri/src-tauri/tauri.macos.conf.jsonnew file mode 100644index 0000000000..f660917c27--- /dev/null+++ b/apps/web/tauri/src-tauri/tauri.macos.conf.json@@ -0,0 +1,17 @@+{+ "$schema": "https://schema.tauri.app/config/2",+ "bundle": {+ "icon": [+ "icons/32x32.png",+ "icons/128x128.png",+ "icons/[email protected]",+ "icons/macos/Macro.icns"+ ],+ "macOS": {+ "files": {+ "Resources/Assets.car": "icons/macos/Assets.car"+ },+ "infoPlist": "icons/macos/Info.plist"+ }+ }+}diff --git a/nix/tauri-desktop.nix b/nix/tauri-desktop.nixindex 03f26703ca..3052433885 100644--- a/nix/tauri-desktop.nix+++ b/nix/tauri-desktop.nix@@ -210,7 +210,10 @@cargoLock = ../apps/web/tauri/Cargo.lock;# cache-core's build script generates metadata from the GraphQL schema.# Non-Cargo inputs must be added explicitly to crane's app fileset.- extraFileset = ../static_assets/schema.graphql;+ extraFileset = lib.fileset.unions [+ ../static_assets/schema.graphql+ ../apps/web/tauri/src-tauri/tauri.macos.conf.json+ ];inherit frontend;craneArgs = {