feat(ui): importer carries dat justification (0x14/0x15) onto text widgets; drop character footer-title height hack
LayoutImporter.ReadState now reads Properties[0x14] (HorizontalJustification, EnumBaseProperty: 0=Left, 1=Center, 3/5=Right) and Properties[0x15] (VerticalJustification: 2=Top, 4=Bottom; else Center) into two new ElementInfo fields HJustify/VJustify. Merge propagates them with the same non-default-wins rule used for FontDid. DatWidgetFactory.BuildText applies the resolved justify at build time: HJustify=Center sets Centered=true, HJustify=Right sets RightAligned=true, VJustify=Top/Bottom sets VerticalJustify. Controllers that FindElement and set those properties afterward continue to override - backward-compat preserved. UiText gains VerticalJustify (Top/Center/Bottom, default Center). The Centered and RightAligned single-line paths call UiText.VOffset() for the Y coordinate, so VJustify.Top renders text at y=Padding rather than the fixed (H-lh)/2 center. CharacterStatController: footer title (0x1000024E, H=55 dat box) previously used Height=18 + Anchors=None to prevent center-vertical overlap with line-1/2. Diagnostic confirmed dat says HJustify=Center, VJustify=Center. The hack is replaced with one minimal explicit override: VerticalJustify=Top on the already-Centered element. Text now renders at top of the 55px box natively. Centered=false and RightAligned=false hand-sets removed where dat supplies them. Dat justify values (studio diagnostic, 2026-06-26): 0x1000024E footer title: HJustify=Center, VJustify=Center 0x10000235/0x10000243/0x10000245 value fields: HJustify=Right header name/heritage/pk/level: HJustify=Center +13 tests: ElementReader Merge propagation; DatWidgetFactory BuildText justify application + controller-override backward-compat; UiText VOffset. 696 passed, 0 failed. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
parent
8f222f7506
commit
41430420b3
8 changed files with 328 additions and 18 deletions
|
|
@ -2,6 +2,7 @@ using System;
|
|||
using System.Collections.Generic;
|
||||
using System.Numerics;
|
||||
using AcDream.App.UI;
|
||||
using AcDream.App.UI.Layout;
|
||||
|
||||
namespace AcDream.App.Tests.UI;
|
||||
|
||||
|
|
@ -140,4 +141,57 @@ public class UiTextTests
|
|||
Assert.Equal(new UiText.Pos(1, 2), s2);
|
||||
Assert.Equal(new UiText.Pos(1, 8), e2);
|
||||
}
|
||||
|
||||
// ── VOffset: vertical positioning for single-line mode ───────────────────
|
||||
|
||||
/// <summary>
|
||||
/// VJustify.Center: vertical offset = (height - lineHeight) / 2.
|
||||
/// This is the original formula used by both the Centered and RightAligned paths
|
||||
/// before VerticalJustify was introduced. Must remain unchanged (backward compat).
|
||||
/// </summary>
|
||||
[Fact]
|
||||
public void VOffset_Center_ReturnsHalfHeightMinusLineHeight()
|
||||
{
|
||||
float y = UiText.VOffset(height: 55f, lineHeight: 12f, padding: 0f, VJustify.Center);
|
||||
Assert.Equal((55f - 12f) * 0.5f, y);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// VJustify.Top: vertical offset = padding (top of the content area).
|
||||
/// Used for footer title elements whose dat box is the full footer height (55 px)
|
||||
/// but the text should render near the top.
|
||||
/// </summary>
|
||||
[Fact]
|
||||
public void VOffset_Top_ReturnsPadding()
|
||||
{
|
||||
float y = UiText.VOffset(height: 55f, lineHeight: 12f, padding: 0f, VJustify.Top);
|
||||
Assert.Equal(0f, y);
|
||||
|
||||
float yWithPadding = UiText.VOffset(height: 55f, lineHeight: 12f, padding: 4f, VJustify.Top);
|
||||
Assert.Equal(4f, yWithPadding);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// VJustify.Bottom: vertical offset = height - lineHeight - padding.
|
||||
/// </summary>
|
||||
[Fact]
|
||||
public void VOffset_Bottom_ReturnsHeightMinusLineHeightMinusPadding()
|
||||
{
|
||||
float y = UiText.VOffset(height: 55f, lineHeight: 12f, padding: 2f, VJustify.Bottom);
|
||||
Assert.Equal(55f - 12f - 2f, y);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Center with non-zero padding: padding does NOT affect the center formula —
|
||||
/// VJustify.Center always uses (height - lineHeight) / 2 regardless of padding,
|
||||
/// matching the original behavior.
|
||||
/// </summary>
|
||||
[Fact]
|
||||
public void VOffset_Center_IgnoresPadding()
|
||||
{
|
||||
float yNoPad = UiText.VOffset(height: 40f, lineHeight: 12f, padding: 0f, VJustify.Center);
|
||||
float yWithPad = UiText.VOffset(height: 40f, lineHeight: 12f, padding: 4f, VJustify.Center);
|
||||
Assert.Equal(yNoPad, yWithPad); // Center is padding-independent
|
||||
Assert.Equal((40f - 12f) * 0.5f, yNoPad);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue