[ymote]

Upstreams OctosCode's Octoscript-Makepad patch series, so OctosCode can drop its fork and build against this repository.

Source. OctosCode (octos-org/octoscode-app) keeps a fork of this repository built from patches/octoscript-makepad/0001–0007 on its main, applied on top of 6881fb6 by tools/prepare-octoscript-makepad-fork.sh. This PR is stacked on #75 (feat/mail-card-runtime, 27e9c1b, the commit OctoSense pins today), so its diff shows only these commits. design.rs and beauty.rs are identical at 6881fb6 and 27e9c1b, and the series applies there without conflicts.

Commits

One commit per behaviour. Each one builds and passes the portable tests on its own.

Commit	Behaviour	From
design: lay out row and col stacks as flows	A stack with variant: row|col lowers to flow: Right|Down with pad/padx/pady and spacing; the flow places its children (no abs_pos, no margin). A filled one is a DesignSurface, so radius rounds it.	0001
design: size measured nodes with fill and fit flags	fillw/fillh emit Fill and fitw/fith emit Fit in place of the measured extent. Unmeasured text wraps; an unmeasured image must state image_width/image_height; an empty font_src fails like a missing one.	0001
design: end a filled single-line label in an ellipsis	fillw single lines get max_lines: 1 and TextOverflow.Ellipsis.	0001
kit-host: clear the beauty-host window to white	Components without a fill preview on white rather than the theme's grey.	0001
design: lower markdown text to a Markdown flow with inline-code chips	variant: markdown text lowers to Markdown. Inline code is drawn as chips filled with the node's bg. Wrapped lines advance at most 1.4× the font size; the source line_height becomes paragraph_spacing.	0002, 0004
design: anchor alignx 1 nodes to their parent's right edge	A non-text node with alignx: 1 keeps its inset from the parent's right edge and follows the parent's width; its children move with it.	0003
design: place fill-width text and stacks with a wrapper	A fillw stack or left-aligned text outside a flow sits in a wrapper that keeps its insets on both sides, so Fill resolves to a finite width.	0003, 0004, 0006
node, render, design: add padright, an inset from the parent's right edge	New Attrs::padright overrides that right inset for both wrappers.	0006
design: add to_makepad_ui_in_slot for trees mounted in a slot	Places the root by a margin from its slot, so every node is parent-relative instead of using window-coordinate abs_pos.	0007
design: cap the line spacing of wrapping text only when asked	to_makepad_ui_with(tree, Options). cap_wrapped_line_spacing applies the 1.4× cap to wrapping text, and in_slot does what to_makepad_ui_in_slot does. The defaults lower exactly as before.	0005

Changes relative to the original patches

Requested cleanups:

• Generic monospace font. 0002 named OctosCode's own self:resources/ux/LiberationMono-Regular.ttf. Inline code now uses mod.theme.font_code, the theme's code style, which makepad's own Markdown uses. Both makepad font sets map that role to the same LiberationMono face, now from makepad_widgets. The member metrics are now the theme's (asc/desc 0 instead of 0.04).
• Opt-in line-spacing cap. 0005 capped every wrapping Text at 1.4× its font size, which changed every caller's output. It is now Options::cap_wrapped_line_spacing, off by default. Markdown regions are new here and are always capped (0004).
• Comments and messages describe behaviour instead of OctosCode card numbers, probe names or file references.

Fixes to the patch code (output is unchanged for everything in OctosCode's committed design tree; see Verification):

• 0002 put inline_code_padding/inline_code_margin inside draw_block. Those are TextFlow widget fields, not DrawFlowBlock fields, so they did nothing. They are dropped; chips keep the theme's padding and margin, as they already did.
• 0001 emitted draw_bg.radius on a plain View, whose background has no radius. A filled row/col stack is now a DesignSurface, so the radius rounds it, as the patch's comment intended.
• Wrappers are offset from the parent's source frame. The patch used the node's window position, which is only right when the parent is at the origin. The wrapper also takes the node's own height, so fillh is honoured; the patch used the measured h or 0.
• For a right-anchored node, padright replaces the measured gap. The patch added it on top of the gap (on the wrapper), so a button stated as 40 from the edge landed 40 plus its gap. A root's gap is 0, so roots behave the same either way.
• An image with fillw/fillh and no frame returns "design image size required"; the patch panicked on a.w.unwrap().
• Text with no measured height wraps. The patch read the missing height as 0, which forced it onto one line.
• A fill flag wins over a fit flag on both axes. The patch let fith beat fillh; no known source sets both.
• Removed two clippy findings in the patch: unnecessary_unwrap, and an if with two identical abs_pos branches.

Kept out on purpose:

• Row/Column kinds stay unsupported in this translator. 0001 also accepted the DSL's Row/Column kinds. Its own comment says compiled cards never produce them, and OctosCode's design sources use only stack + variant: row|col. Accepting them would route kit-composed L0 cards into this translator (see Glance tiles).
• An empty font_src fails closed, for the same reason: the L0 kit's text roles carry font_src: "".

Downstream notes

• Attrs has a new field. Code that builds Attrs { … } listing every field must add padright. In OctoSense that is AppCard's apps/appcard/app/app/src/app/l0_eval.rs:222. It mirrors this repository's evaluator, so padright: f32_prop(vm, value, id!(padright)) keeps it in step; padright: None also compiles. OctoSense's other Attrs literals end with ..Attrs::default(). OctoSense is not changed here.
• Reproducing OctosCode's fork output. Call design::to_makepad_ui_with(&tree, Options { cap_wrapped_line_spacing: true, ..Default::default() }) where it now calls to_makepad_ui. Call Options { in_slot: true, cap_wrapped_line_spacing: true } where it calls to_makepad_ui_in_slot. The mono font no longer goes through OctosCode's with_fonts path rewrite.

Glance tiles (OctoSense crates/shell/src/glance_card.rs)

lower_report refuses kit packs (line 139), so a tile's tree is always kit-composed. It tries design::to_makepad_ui first and falls back to to_makepad_l0_ui when that fails (line 154).

• At the base, every such tree fails here, mostly with unsupported measured design node: Column.

• With the series as written, real cards would still fall back: their columns and rows lack heights, and their titles and captions lack widths. Minimal cards would not:

  • Surface { TextBody }
  • Surface { TextCaption(width: .fill) }
  • a bare TextBody root

  These would lower through the measured-design path with crate_resource("") as their font, the body forced onto one ellipsized line, and the page's top and bottom padding dropped.

• With this PR, tiles behave as before. I replayed lower_report up to line 154 for OctoSense's 27 .card files and 8 minimal cards, in both shell modes. Every card gets the same outcome as at the base.

Verification

The repository has no .github/workflows, so the commands follow AGENTS.md, run in a worktree. Setup:

• ../makepad and ../octoscript are worktrees at the runtime.json revisions (c155f61d, 2e37d9e6).

• Cargo.lock is gitignored, so I used the lockfile already generated for 27e9c1b and ran every command with --locked.

• cargo test --release --locked -p octoscript-node -p octoscript-render -p octoscript-makepad: base 86 passed. Head 96 passed, 0 failed (10 new tests in design.rs). Each of the 10 commits also passes on its own.

• cargo clippy --locked --no-deps -p octoscript-node -p octoscript-render -p octoscript-makepad -p kit-host --all-targets -- -W clippy::erasing_op: passes, with the same warnings as the base and none in the files touched here.

  • Without -W clippy::erasing_op, clippy fails at base and head alike on the existing deny-level lint at crates/octoscript-makepad/src/material.rs:672, which this PR does not touch.
  • Without --no-deps, it also lints makepad-plot, which has existing deny-level approx_constant errors.

• cargo fmt -p <crate> -- --check: already fails at the base on existing code, so this PR only avoids adding to it. Hunk counts, base → head: octoscript-node 9 → 9, octoscript-render 7 → 7, octoscript-makepad 159 → 155, kit-host 45 → 45.

  • Lines added here are rustfmt-clean, except the new Markdown arm inside the existing, unformatted widget match.

• Output comparison. A scratch harness, not committed, lowered all 124 page.card files in OctosCode's design/ through l0::prepare:

  • Default options against the base: byte-identical except the 5 Markdown regions, which were Labels before.
  • With cap_wrapped_line_spacing, and with in_slot plus the cap, against the original series: byte-identical except two lines per Markdown region, text_style_fixed and draw_block.

• Native acceptance: a hidden MAKEPAD_HIDE_WINDOWS=1 BEAUTY_REQUEST=… target/release/beauty-host --remote run (Metal) on a design that exercises every feature. The artboard is 393 wide, the window 480, and the root has fillw.

  • The tree evaluated and mounted, and /log held no warnings or errors.

  /snap rectangles:

  Node	Rect	Why
  row flow	[16,16,361,44]	Its children are at [28,24,…] and [64,24,…]: 12/8 padding, 8 spacing.
  filled title	[16,76,287,24]	480 − 16 − its measured 177 right gap.
  padright: 16 bar	[16,112,448,40]	Insets of 16 on both sides.
  right-anchored button	[420,168,44,44]	480 − 16 − 44; its child is at [432,180,20,20], moved with it.
  Markdown	[16,228,361,150]	Its measured frame.

  The /gq frame shows a white clear colour, a rounded row fill, the title ending in "…", and inline code drawn in monospace on light chips. The process exited after /gq.

🤖 Generated with Claude Code