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

feat(chat): Campaign CH slice CH6a — retail chat-window layout + 8-grip resize

Browse source 
Swap ChatWindowController's imported main-chat LayoutDesc from the wrong
0x21000006 (an unrelated layout whose root and 800px resize bar appear
nowhere in the EoR gameplay UI) to retail's ACTUAL main chat window,
0x2100006F (window root 0x10000600, authored 410x100 — confirmed by a
direct DAT dump, found in dats.Local not dats.Portal). Every downstream
compensation that existed only to paper over the wrong import is deleted:
the hand-cropped 490px content width, the dropped 800px resize bar, the
9px transcript patch, the orphan-sibling pruning, the max/min-vs-scrollbar
overlap shift, and the scrollbar top-reclaim. The window now mounts with
RetailWindowChrome.Imported (0x2100006F's own 8 border/corner elements are
its complete chrome) instead of the universal nine-slice wrapper.

LayoutImporter/DatWidgetFactory gain a Type-9 (UIElement_Resizebar) case:
UiResizeGrip decodes retail's exact four-bool BorderLocation algorithm
(0x2A=bottom/0x2B=left/0x2C=right/0x2D=top,
UIElement_Resizebar::StartMouseResizing @0x0046B7E0) into a ResizeEdges
bitmask. A direct DAT dump established the true shape: only 7 of the 8
grip-position ids are Type 9 — the straight top-EDGE strip (0x1000069C) is
a Type-2 Dragbar (move handle), not a Resizebar, because the main window
has no title bar. UiRoot now gives a directly-hit grip's own edges
priority over its generic proximity heuristic, and a directly-hit move
handle the same priority over ambient proximity — so the plain top strip
moves the window while its two corner grips resize it including the Y
axis, and all 4 edges + 4 corners work everywhere else. This also fixes
the reported "no diagonal cursor at corners" (CursorFeedbackController's
existing RetailCursorCatalog cursor ids already matched the DAT exactly;
they just never received a genuine diagonal edge combination) and "cannot
grow in Y from the bottom-right corner" (the old NineSlice+crop mount's
indirection is gone; the Imported mount uses the DAT's real
minH=100/maxH=2000/minW=300/maxW=2000 directly).

The 8 cosmetic "_Locked" border-art twins default hidden (register row
AP-185 — retail's UiLocked-driven art swap between the two skins is not
ported; UiRoot.UiLocked continues to gate the underlying interaction
correctly either way). The 4 chat-window-1..4 indicator buttons import
generically (visible, inert) for CH6b to wire. The two hand-drawn
translucent-black tints on the transcript/input are removed now that
their parent panels draw their own authored background sprites.

Filed #366 (chat window's new-unseen-text indicator 0x1000048C is
swallowed by UiText.ConsumesDatChildren, pre-existing and out of scope).
Corrected the research doc's "all eight grips" claim against the direct
DAT dump. Full Release suite: 12,317 passed / 4 skipped / 0 failed.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
Erik 2026-08-10 09:38:27 +02:00
parent ab82347d42
commit 1fd515436c
19 changed files with 6734 additions and 5694 deletions
Download patch file Download diff file Expand all files Collapse all files

57
tests/AcDream.App.Tests/UI/CursorFeedbackControllerTests.cs
View file

@ -97,6 +97,63 @@ public sealed class CursorFeedbackControllerTests
Assert.Equal(new UiCursorMedia(0x06006128u, 16, 16), active.Cursor);
}
[Fact]
public void CornerGrip_ShowsTheDiagonalResizeCursor_NotTheStraightOne()
{
// Campaign CH slice CH6a, user-gate round 2 item 6: hovering a directly
// authored corner Resizebar grip (not just the generic proximity edge)
// must resolve to the retail diagonal cursor, matching the same pinned
// ids as ResizeEdges_chooseExpectedRetailCursor (0x06006126 for the
// NW-SE UL/LR diagonal).
var root = new UiRoot { Width = 400, Height = 300 };
var window = new UiPanel
{
Left = 50, Top = 40, Width = 150, Height = 100,
Draggable = true, Resizable = true,
};
var grip = new UiResizeGrip
{
BorderLocation = UiResizeGrip.Border.LowerRight,
Left = 145, Top = 95, Width = 5, Height = 5,
};
window.AddChild(grip);
root.AddChild(window);
var controller = new CursorFeedbackController();
var gs = grip.ScreenPosition;
root.OnMouseMove((int)(gs.X + 2), (int)(gs.Y + 2));
CursorFeedback feedback = controller.Update(root);
Assert.Equal(CursorFeedbackKind.ResizeDiagonalNwse, feedback.Kind);
Assert.Equal(new UiCursorMedia(0x06006126u, 16, 16), feedback.Cursor);
}
[Fact]
public void EdgeGrip_ShowsTheStraightResizeCursor()
{
var root = new UiRoot { Width = 400, Height = 300 };
var window = new UiPanel
{
Left = 50, Top = 40, Width = 150, Height = 100,
Draggable = true, Resizable = true,
};
var grip = new UiResizeGrip
{
BorderLocation = UiResizeGrip.Border.Bottom,
Left = 5, Top = 95, Width = 140, Height = 5,
};
window.AddChild(grip);
root.AddChild(window);
var controller = new CursorFeedbackController();
var gs = grip.ScreenPosition;
root.OnMouseMove((int)(gs.X + 2), (int)(gs.Y + 2));
CursorFeedback feedback = controller.Update(root);
Assert.Equal(CursorFeedbackKind.ResizeVertical, feedback.Kind);
Assert.Equal(new UiCursorMedia(0x06005E66u, 16, 16), feedback.Cursor);
}
[Fact]
public void AuthoredWidgetCursor_winsUntilSyntheticWindowMoveStarts()
{