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

fix(ui): FA3 fix-round — wire Friends/Squelch scrollbars, gate rebuild on visibility, fix revision-latch ordering

Browse source 
Campaign FA slice FA3 dual-lens review fix round.

Blast MUST-FIX 1: SocialFriendsPageController/SocialSquelchPageController
never wired their ListBox's own sibling scrollbar (Friends
0x10000517->0x10000518, Squelch 0x1000053E->0x10000543) — the two lists
had NO scroll driver at all (no wheel fallback exists on
UiScrollablePanel), making any roster past the visible extent completely
unreachable, not just awkward to scroll. Both controllers now wire
`scrollbar.Model = listBox.Scroll` scoped to their own page root, exactly
like the four existing UiTemplateListBox consumers
(Character/Chat/Config/KeyboardConfig). New tests prove the wiring AND
that a >panel-height roster is actually reachable through it.

Blast SHOULD-FIX 2/3: the Friends/Squelch resolver re-ran
LayoutImporter.ImportInfos (a full DAT tree walk) under the shared DAT
lock on EVERY row, every revision, even while the panel was closed —
RetailUiRuntime.MountSocialPanel's TemplateResolver now caches each row
template's ElementInfo the first time it is resolved and never
re-Imports for that template id again. SocialPanelController additionally
gates the Friends/Squelch Tick-driven rebuild on the panel's own
visibility via the (previously unused) IRetainedPanelController
OnShown/OnHidden hooks, so no DAT-locked rebuild work runs at all while
the panel is closed. SocialFriendsPageController/SocialSquelchPageController
also now only advance _lastRevision after every row resolves — a
transient resolver miss no longer latches an empty roster until the next
server-side change; it retries on the next Tick instead.

Mechanism SHOULD-FIX 8: SocialPanelController.Tick() now returns early
once disposed, matching every other J-slice teardown discipline (it was
being ticked unconditionally forever since RetailUiRuntime never nulls
the field).

Mechanism SHOULD-FIX 1: IsShowingAllegiance's doc claimed the F3/F4
close-on-second-press semantics were "retail's Toggle-action semantics" —
re-derived and confirmed NO retail OnAction consumer exists for either
action anywhere in the binary. Relabeled as acdream's own
OpenSpellbook-precedent convention; no register row added, following the
same no-row precedent OpenSpellbook and every other non-toolbar Toggle
panel already sets. Unknown filed as U11 in the panel-structure research
doc's §8 table.

Tests: 5 new (2 scrollbar-wiring pins, 2 long-roster-reachable-via-
scrollbar, 1 hidden-panel-does-not-rebuild/shown-panel-catches-up); 2
existing tests updated for the new visibility gate.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
Erik 2026-08-12 03:43:35 +02:00
parent 9e622f565e
commit 9afa05b563
5 changed files with 355 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

178
tests/AcDream.App.Tests/UI/Layout/SocialPanelControllerTests.cs
View file

@ -34,13 +34,16 @@ public sealed class SocialPanelControllerTests
}
/// <summary>Mirrors the real Friends/Squelch row templates' own two-deep
/// nested-text shape (FA3 live-mount probe) so
/// nested-text shape AND their own authored extent (270x24, mechanism
/// SF-9's live dump) — FA3 live-mount probe — so
/// <see cref="SocialPanelRowText.FindDeepest"/> has something realistic
/// to resolve, without needing the templates' own (uncommitted, separate
/// to resolve and <see cref="UiTemplateListBox.ContentHeight"/> grows
/// realistically per row (blast MF-1's long-roster scroll tests),
/// without needing the templates' own (uncommitted, separate
/// LayoutDesc) fixtures.</summary>
private static UiElement? FakeRowTemplateResolver(uint layoutId, uint elementId)
{
var outer = new UiText();
var outer = new UiText { Width = 270f, Height = 24f };
var inner = new UiText();
outer.AddChild(inner);
return outer;
@ -228,7 +231,13 @@ public sealed class SocialPanelControllerTests
layout, MakeCallbacks(friends: friends));
Assert.NotNull(controller);
UiElement friendsPage = UiElement.FindDescendant(controller!.TabPanel, 0x10000513u)!;
// Fix-round blast SF-2: Friends/Squelch rebuild is gated on the
// panel's own visibility — simulate the window being shown, the
// same IRetainedPanelController.OnShown() the window manager calls
// in production.
controller!.OnShown();
UiElement friendsPage = UiElement.FindDescendant(controller.TabPanel, 0x10000513u)!;
var listBox = Assert.IsType<UiTemplateListBox>(
UiElement.FindDescendant(friendsPage, 0x10000517u));
Assert.Equal(0, listBox.ViewportForTest?.Children.Count ?? 0);
@ -269,6 +278,14 @@ public sealed class SocialPanelControllerTests
// ── D1: Friends/Squelch action buttons are honest INERT ────────────────
/// <summary>
/// Pins the INERT contract register row AD-79 enumerates. Fix-round
/// mechanism SF-5: AD-79 names SEVEN controls (three Friends buttons,
/// the Friends "Appear Offline"-shaped checkbox, three Squelch
/// buttons) but this test previously only covered the six buttons —
/// <c>0x1000052C</c> builds through <see cref="DatWidgetFactory.BuildCheckbox"/>
/// as a <see cref="UiButton"/> too, so it slots into the same loop.
/// </summary>
[Fact]
public void FriendsAndSquelchActionButtons_AreClickable_ButHaveNoHandler()
{
@ -276,7 +293,7 @@ public sealed class SocialPanelControllerTests
SocialPanelController? controller = SocialPanelController.Bind(layout, MakeCallbacks());
Assert.NotNull(controller);
foreach (uint buttonId in new[] { 0x10000514u, 0x10000515u, 0x10000516u })
foreach (uint buttonId in new[] { 0x10000514u, 0x10000515u, 0x10000516u, 0x1000052Cu })
{
var button = Assert.IsType<UiButton>(
UiElement.FindDescendant(controller!.TabPanel, buttonId));
@ -289,4 +306,155 @@ public sealed class SocialPanelControllerTests
Assert.Null(button.OnClick);
}
}
// ── Scrollbar wiring (blast MF-1) ───────────────────────────────────────
[Fact]
public void Friends_ScrollbarModel_IsWiredToListBoxScroll()
{
ImportedLayout layout = FixtureLoader.LoadSocialPanelHost();
SocialPanelController? controller = SocialPanelController.Bind(layout, MakeCallbacks());
Assert.NotNull(controller);
UiElement friendsPage = UiElement.FindDescendant(controller!.TabPanel, 0x10000513u)!;
var listBox = Assert.IsType<UiTemplateListBox>(
UiElement.FindDescendant(friendsPage, 0x10000517u));
var scrollbar = Assert.IsType<UiScrollbar>(
UiElement.FindDescendant(friendsPage, 0x10000518u));
Assert.Same(listBox.Scroll, scrollbar.Model);
}
[Fact]
public void Squelch_ScrollbarModel_IsWiredToListBoxScroll()
{
ImportedLayout layout = FixtureLoader.LoadSocialPanelHost();
SocialPanelController? controller = SocialPanelController.Bind(layout, MakeCallbacks());
Assert.NotNull(controller);
UiElement squelchPage = UiElement.FindDescendant(controller!.TabPanel, 0x1000054Au)!;
var listBox = Assert.IsType<UiTemplateListBox>(
UiElement.FindDescendant(squelchPage, 0x1000053Eu));
var scrollbar = Assert.IsType<UiScrollbar>(
UiElement.FindDescendant(squelchPage, 0x10000543u));
Assert.Same(listBox.Scroll, scrollbar.Model);
}
/// <summary>
/// Blast MF-1: proves a roster taller than the panel is actually
/// REACHABLE through the scrollbar, not merely wired-but-unused. 40 rows
/// at the real Friends row template's own height (270x24, mechanism
/// SF-9's live dump) comfortably exceed the ListBox's authored extent
/// (270x400) — this roster genuinely needs scrolling.
/// </summary>
[Fact]
public void Friends_LongRoster_IsReachableViaScrollbar()
{
var friends = new FriendsState();
var entries = new List<FriendEntry>();
for (uint i = 0; i < 40; i++)
entries.Add(new(i, $"Friend{i}", true, false, System.Array.Empty<uint>(), System.Array.Empty<uint>()));
friends.Apply(new FriendsUpdate(FriendsUpdateType.Full, entries));
ImportedLayout layout = FixtureLoader.LoadSocialPanelHost();
SocialPanelController? controller = SocialPanelController.Bind(
layout, MakeCallbacks(friends: friends));
Assert.NotNull(controller);
UiElement friendsPage = UiElement.FindDescendant(controller!.TabPanel, 0x10000513u)!;
var listBox = Assert.IsType<UiTemplateListBox>(
UiElement.FindDescendant(friendsPage, 0x10000517u));
var scrollbar = Assert.IsType<UiScrollbar>(
UiElement.FindDescendant(friendsPage, 0x10000518u));
Assert.True(
listBox.ContentHeight > (int)listBox.Height,
$"40 rows (contentHeight={listBox.ContentHeight}) should exceed the box's own height ({listBox.Height})");
// The scrollbar's Model IS the ListBox's own Scroll — moving it
// moves the SAME state that positions the rows
// (UiScrollablePanel.LayoutScrollableChildren, driven by the real
// render loop; simulated directly here since this is a dat-free
// controller test with no Draw pass).
scrollbar.Model!.SetExtents(listBox.ContentHeight, (int)listBox.Height);
Assert.True(scrollbar.Model.HasOverflow);
int before = scrollbar.Model.ScrollY;
scrollbar.Model.ScrollByLines(4);
Assert.True(scrollbar.Model.ScrollY > before);
}
/// <summary>Squelch counterpart of <see cref="Friends_LongRoster_IsReachableViaScrollbar"/>
/// (270x430 authored extent).</summary>
[Fact]
public void Squelch_LongRoster_IsReachableViaScrollbar()
{
var characters = new Dictionary<uint, SquelchInfo>();
for (uint i = 0; i < 40; i++)
characters[i] = new SquelchInfo($"Grief{i}", false, new HashSet<uint>());
var squelch = new SquelchState();
squelch.Replace(new SquelchDatabase(
new Dictionary<string, uint>(System.StringComparer.OrdinalIgnoreCase),
characters,
new SquelchInfo(string.Empty, false, new HashSet<uint>())));
ImportedLayout layout = FixtureLoader.LoadSocialPanelHost();
SocialPanelController? controller = SocialPanelController.Bind(
layout, MakeCallbacks(squelch: squelch));
Assert.NotNull(controller);
UiElement squelchPage = UiElement.FindDescendant(controller!.TabPanel, 0x1000054Au)!;
var listBox = Assert.IsType<UiTemplateListBox>(
UiElement.FindDescendant(squelchPage, 0x1000053Eu));
var scrollbar = Assert.IsType<UiScrollbar>(
UiElement.FindDescendant(squelchPage, 0x10000543u));
Assert.True(
listBox.ContentHeight > (int)listBox.Height,
$"40 rows (contentHeight={listBox.ContentHeight}) should exceed the box's own height ({listBox.Height})");
scrollbar.Model!.SetExtents(listBox.ContentHeight, (int)listBox.Height);
Assert.True(scrollbar.Model.HasOverflow);
int before = scrollbar.Model.ScrollY;
scrollbar.Model.ScrollByLines(4);
Assert.True(scrollbar.Model.ScrollY > before);
}
// ── Rebuild discipline (blast SF-2/SF-3) ────────────────────────────────
/// <summary>
/// Blast SF-2: the panel's Friends/Squelch rebuild must not run while
/// the window is closed. <see cref="SocialPanelController"/> starts
/// with no visibility notification (matches production: the window
/// mounts <c>Visible = false</c> and nothing calls <c>OnShown</c> until
/// F3/F4), so a revision bump with no <c>OnShown</c> call must NOT
/// rebuild the list; the SAME bump picked up on the next <c>Tick()</c>
/// after <c>OnShown()</c> proves the rebuild is deferred, not lost.
/// </summary>
[Fact]
public void Friends_RevisionBumpWhileHidden_DoesNotRebuild_ButRebuildsOnShow()
{
var friends = new FriendsState();
ImportedLayout layout = FixtureLoader.LoadSocialPanelHost();
SocialPanelController? controller = SocialPanelController.Bind(
layout, MakeCallbacks(friends: friends));
Assert.NotNull(controller);
UiElement friendsPage = UiElement.FindDescendant(controller!.TabPanel, 0x10000513u)!;
var listBox = Assert.IsType<UiTemplateListBox>(
UiElement.FindDescendant(friendsPage, 0x10000517u));
friends.Apply(new FriendsUpdate(
FriendsUpdateType.Add,
new List<FriendEntry> { new(1u, "Alice", true, false, System.Array.Empty<uint>(), System.Array.Empty<uint>()) }));
// Panel never shown — Tick() must not rebuild.
controller!.Tick();
Assert.Equal(0, listBox.ViewportForTest?.Children.Count ?? 0);
// Showing the panel and ticking again picks up the accumulated bump.
controller.OnShown();
controller.Tick();
Assert.Single(listBox.ViewportForTest!.Children);
}
}