erik/acdream
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

feat(ui): importer carries dat FontColor (0x1B) onto text widgets; character colors from dat where present

Browse source 
LayoutImporter.ReadState now reads Properties 0x1B (ColorBaseProperty, ARGB bytes) and stores the normalized Vector4 in ElementInfo.FontColor (nullable). ElementReader.Merge propagates it with the same non-null-derived-wins rule as FontDid and HJustify. DatWidgetFactory.BuildText seeds UiText.DefaultColor from FontColor when present.

Diagnosis for LayoutDesc 0x2100002E: ALL 12 header and footer text elements carry NO dat color. Every color is runtime set by CharacterStatController. Comments added at each callsite. No hardcoded colors deleted.

Tests added: 3 ElementReader FontColor Merge + 3 DatWidgetFactory DefaultColor. 702 passed, 0 failed. Screenshots: character window, vitals, toolbar all unchanged.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
Erik 2026-06-26 10:15:55 +02:00
parent 41430420b3
commit 6e0be4bd34
7 changed files with 154 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

42
tests/AcDream.App.Tests/UI/Layout/ElementReaderTests.cs
View file

@ -1,3 +1,4 @@
using System.Numerics;
using AcDream.App.UI;
using AcDream.App.UI.Layout;
namespace AcDream.App.Tests.UI.Layout;
@ -214,4 +215,45 @@ public class ElementReaderTests
var merged = ElementReader.Merge(base_, derived);
Assert.Equal(VJustify.Bottom, merged.VJustify);
}
// ── FontColor — Merge propagation (Fix B) ────────────────────────────────
/// <summary>
/// When the derived element has an explicit (non-null) FontColor, the derived value
/// wins in Merge — same "non-null derived wins" rule used for FontDid and HJustify.
/// </summary>
[Fact]
public void Merge_DerivedFontColor_OverridesBaseNull()
{
var base_ = new ElementInfo { FontColor = null };
var derived = new ElementInfo { FontColor = new Vector4(1f, 0f, 0f, 1f) };
var merged = ElementReader.Merge(base_, derived);
Assert.Equal(new Vector4(1f, 0f, 0f, 1f), merged.FontColor);
}
/// <summary>
/// When the derived element has no FontColor (null), the base's FontColor is inherited.
/// A null-derived must NOT override a non-null base.
/// </summary>
[Fact]
public void Merge_DerivedFontColorNull_InheritsBaseColor()
{
var gold = new Vector4(1f, 0.82f, 0.36f, 1f);
var base_ = new ElementInfo { FontColor = gold };
var derived = new ElementInfo { FontColor = null }; // default — no dat property
var merged = ElementReader.Merge(base_, derived);
Assert.Equal(gold, merged.FontColor);
}
/// <summary>
/// When neither base nor derived carries a FontColor, the merged result is null.
/// </summary>
[Fact]
public void Merge_BothFontColorNull_MergedIsNull()
{
var base_ = new ElementInfo { FontColor = null };
var derived = new ElementInfo { FontColor = null };
var merged = ElementReader.Merge(base_, derived);
Assert.Null(merged.FontColor);
}
}