Repository navigation
PingFang SC for the shell and every app on macOS (makepad#129 stacked) - #548
Merged
Merged
Conversation
Stacks OctoSense-org/makepad#129 on the pinned Makepad (d653bc44) as tools/runtime-patches/makepad-apple-ui-font.patch: on macOS and iOS every theme text role leads with PingFang SC, read from the system and never packaged, fitted to the theme's line box. The shell, every in-window app and every app process now draw Latin and Chinese in PingFang, where Chinese used to come from the bundled LXGW WenKai beside IBM Plex Sans. Code and icon roles, other platforms and MAKEPAD_SYSTEM_FONTS=0 keep today's faces. The markdown editor no longer installs Rinx's own PingFang override (article_makepad::apple_fonts) in every isolate: Makepad rewrote that family from its declared members before anything drew, so it never took effect. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
ymote
marked this pull request as ready for review
October 20, 2026 01:46
Contributor
Author
|
Local CI passed on 2cfc31b ( GitHub would run for this PR: desktop.yml, phone.yml, apps.yml. Merged on this local pass (macOS runner queue); GitHub CI runs on the merge commit on main.
Skipped (these did NOT pass; (!) marks a skip that blocks tools/ci-local-merge.sh):
Notes:
Native GitHub acceptance passed on the same head: embedded-browser.yml. |
ymote
added a commit
that referenced
this pull request
Oct 20, 2026
#548 stacked makepad-apple-ui-font.patch on the same lock lines. The buffer-stuffing patch now follows it (stacked entry and product fix after #548's) and applies unchanged; the lock tree is regenerated from the whole stack: 9d9aef6e, which differs from main's 90b364c1 only in this patch's Android files. `tools/setup.py --check --cargo` passes. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Why
The maintainer asked for PingFang across OctoSense's desktop and every app, so all of them look alike.
Today the theme's text roles draw Latin text in IBM Plex Sans and Chinese in LXGW WenKai, a calligraphic face. A tab title that mixes the two shows two unrelated typefaces.
The markdown editor installs Rinx's own PingFang override (
article_makepad::apple_fonts) in every isolate, and logs "Apple typography: PingFang SC…" each time. It never takes effect: Makepad sees that the family's member count differs from its declared members and rewrites the family before anything draws.What
tools/runtime-patches/makepad-apple-ui-font.patchstacks Text roles lead with the platform UI typeface (PingFang SC) on macOS and iOS makepad#129 on the pinned Makepad (d653bc44).runtime-patches.lock.jsongets the stacked entry, its sha256, the new tree and aproduct_fixesline. On macOS and iOS, every theme text role leads with PingFang SC, read from the system:MAKEPAD_SYSTEM_FONTS=0keep today's faces.crates/markdown-editorstops installing Rinx's override.The next Makepad sweep drops the patch once makepad#129 is in the pinned revision.
Verified (macOS 26, Apple silicon)
MAKEPAD_HIDE_WINDOWS=1,/ggrabs), built with this patch on top of current main's runtime patches, before and after:MAKEPAD_TRACE_FONT_LOAD=1shows PingFang.ttc loaded as both members.makepad-widgetsfont_policy 5/5 andmakepad-drawtext 49/49, both on macOS.python3 tools/setup.py --checkpasses with the new stacked entry.cargo check --locked -p octosense-markdown-editorpasses.Not covered
stackedand changetreeinruntime-patches.lock.json, so whichever lands second rebases its entry onto the other's tree.🤖 Generated with Claude Code