R2-1/R2-6 (description-box text clipped left of the frame, regressed from
Batch C's frame un-consume): root cause was never the un-consume change
itself — the Heritage/Profession/Town/Summary description boxes
(0x100003C4/0x100003E0/0x10000409/0x10000404) all author retail's four
independent text-inset margins (dat properties 0x23-0x26,
UIElement_Text::OnSetAttribute cases 0xf-0x12: margL=9/margR=26/margU=15/
margD=15), which this codebase never read at all, before or after Batch C.
Un-consuming the gold-frame children just made the pre-existing missing-
margin bug visible for the first time (the frame's own left border now
draws around the same x=0 origin text always used). Fixed end to end:
ElementInfo.MarginLeft/Right/Top/Bottom (read in
ApplyCanonicalLegacyProjection, propagated in Merge), UiText.MarginLeft/
Right/Top/Bottom (additive with the pre-existing Padding), a new pure
UiText.ContentOffsetX static consumed by the multi-line draw path's
per-line placement, and matching wrap-width shrinkage in
DatRichText.Compose and BuildText's own authored-multiline path. Scoped to
the multi-line (non-OneLine) path only.
R2-2/R2-3 (Attribute\n Credits renders the literal backslash-n; the live
credit value overlaps mid-caption): two stacked gaps. (1) UiButton
captions never escape-normalized the DAT's literal "\n" — centralized the
normalize into DatWidgetFactory's ResolveAuthoredString (the one choke
point every P0x17 resolution already shares) plus a NormalizeEscapes
helper for the per-state caption loop, so every caller normalizes
identically. (2) UiButton.Label only ever drew one line — retail's
UIElement_Button IS a UIElement_Text with OneLine=false on these buttons,
so a caption should word-wrap/stack like any other Type-12 box. Added
UiButton.DrawBlockLabel + the pure, unit-tested WrapBlockLines. The
value-overlap itself: ValueBox was never wrong (live-DAT-measured correct
child rects) — the caption was drawing unconfined across the button's
full width ("Available Skill Credits" measures 193px in a 231px button
whose value box starts at x=116). Fixed by confining the caption's own
drawable width to stop before ValueBox.X whenever a ValueLabel coexists.
R2-7a (Summary overview listbox missing its scrollbar): pure wiring gap —
the listbox authors a linked scrollbar via dat property 0x72
(ScrollbarElementId=0x10000401) that CharacterCreationSummaryPage's
constructor never resolved, unlike every other UiTemplateListBox owner in
the codebase. Fixed with the same resolve-and-wire pattern.
R2-7b (how-to box scrollbar overlaps text, no thumb): traced to a
downstream symptom of R2-1, not an independent bug — UiScrollbar only
paints its thumb when the linked model has overflow, and the pre-fix wrap
width (un-inset) produced fewer/shorter lines than fit the view. Pinned
directly against the real installed strings/font (Aluvian's how-to text)
that the margin-correct width overflows. No UiScrollbar code changed.
R2-8 (name field should show "[ Name ]"): re-checked the one hypothesis
Batch A's GF-15 closure left open — an authored initial-text string on
the field's own P0x17. Confirmed absent on every state in the installed
DAT. No code change; Batch A's closure stands, now pinned as a live-DAT
regression test.
App suite 5334/3 (was 5321/3, +13, zero regressions). Runtime 1735/0
unchanged. Full solution Release build green.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Commit 1/3: chargen-scoped, low blast-radius fixes.
- New DatRichText helper: escape-normalize + word-wrap + per-segment
palette color, porting UIElement_Text::SetStringInfoWithFont /
AppendStringInfoWithFont's composition model. Routes the Heritage
(GF-2), Town (GF-11a), and Profession (GF-3) description boxes
through it instead of a raw unwrapped single-Line LinesProvider.
Heritage headers use font-color palette index 1 (green), bodies
index 0 (white), matching AppendStringInfoWithFont's own font-index
argument. Town's diagnosed GF-11a root cause: a single un-wrapped
line meant the town-specific suffix rendered past the clipped
viewport, so switching towns looked like "text never changes" even
though the underlying composed string genuinely differed.
- GF-3: bind the Profession page's description textbox (0x100003e0,
gmCGProfessionPage::InitializePage @0x00483068) and compose its
per-template text (UpdateProfession @0x004821b0's CustomText/
BowText/SwashText/LifeText/WarText/WayText/SoldierText, plain
SetStringInfo — no palette).
- GF-4: UiButton gains a coexisting ValueLabel/ValueBox/ValueFont/
ValueColor slot alongside Label. Retail's chargen display buttons
(avail/health/stamina/mana credits, 0x100003e2-e5/0x100003f9)
author their caption directly on P0x17 AND carry a separate,
media-less Type-12 value child that UiButton.ConsumesDatChildren
used to drop entirely — pages substituted the button's own Label,
destroying the caption. DatWidgetFactory.BuildButton now surfaces
that child (gated on ReferenceEquals(labelInfo, info) — own-caption
buttons only) instead. The six Profession slider name labels
(0x100002ed, CharGenState::GetAttributeName @0x005C3A20's six
hardcoded literals) resolve as UiButton in this port (live-DAT-
measured Type 1 — retail's UIElement_Button is DynamicCast(0xc)-
compatible with UIElement_Text) and are written once at
construction, matching retail's own single InitializePage write.
- GF-6/AP-218: gmCGAppearancePage::Update writes a heritage-flavored
STATIC caption to the Hair/Eyes/Skin spins (plain / GearText_* /
OlthoiText_* variants) — never an index. Removed the prior 1-based-
ordinal/gear-name substitution entirely; the other six spins keep
their DAT-authored caption untouched, matching retail exactly.
- Root 1d: wire the Heritage (0x100003be, 13 states) and Profession
(0x100003d8, 7 states) backdrop SetState cascades
(gmCGHeritagePage::Update / gmCGProfessionPage::UpdateProfession).
- AP-216/AP-217 (partial, register updated honestly): swatches beyond
the current part's real color count now hide (DoColorSpots' blank-
blit half); the GradCircle now blanks for Eyes (DoGradDisk's blank-
plug half). The "paint with the actual represented/current color"
halves stay open — they need a PalSet/Palette-id -> RGB pipeline no
chargen page reads at runtime yet, judged disproportionate to add
alongside this batch's other ~10 fixes.
Register: AP-215 rewritten (item 2's "ordinal" framing is stale after
GF-6; restated as the icon-thumbnail gap), AP-216/AP-217 rewritten
(partially closed), AP-218 retired, AD-103 retired (the swallowed-
child Label substitution AD-103 tracked is replaced by ValueLabel's
own-geometry surfacing).
22 new tests (DatRichText unit tests, UiButton/DatWidgetFactory
ValueLabel tests, live-DAT structural pins, controller behavioral
tests) — all green. Full App suite (Release, live-DAT):
5300 passed / 1 pre-existing unrelated flake (PortalProjectionTests
allocation test, passes in isolation) / 3 skipped, up from the
baseline 5282/3.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Erik