fix: social panel completion batch (user gate 2026-08-13, "fix all")
One user-ordered batch across the FA social panel + world selection.
Every root cause was probe-proven before the fix (new
ProbeSocialClickRouting in SocialPanelLiveMountProbeTests - production
window mount + real UiRoot hit-tests + a synthetic click):
1. STUCK CHECKBOXES (fellowship x4, allegiance x1, "always checked /
can't change any options"): the authored checkboxes carry DAT
ToggleBehavior, so UiButton SELF-FLIPS Selected at MouseUp - the old
handlers read the flipped value and wrote the ORIGINAL back, snapping
every click to where it started (the probe recorded (id, oldValue)).
Fix: SuppressSelfToggle (the CH6a/b mirror discipline) + derive the
next value from the STORE; the per-tick seeding mirrors it back.
2. UNCLICKABLE ROSTER ROWS ("only get the move window cursor"): the row
name text is display-text ClickThrough=true, which the hit-test walk
skips regardless of HandlesClick - the wired OnClick was unreachable.
Fix: UiText.OnClick assignment now clears ClickThrough (central,
documented); the stats text gains the same select handler so most of
the row's width selects the fellow.
3. TRUNCATED EMPTY-STATE ("You do not belong... To create MISSING"):
the authored string resolves COMPLETE (three sentences) but embedded
'\n's rendered as one clipped line. DatWidgetFactory now splits
authored strings into one Line per newline, with the provider still
re-reading DefaultColor live (the state-color contract - caught by
BuildText_AuthoredLineTracksStateFontColor).
4. FELLOW NAMES WHITE (user-directed): the AD-82 invented leader-gold +
selection-blue tints are deleted; names always white (register row
narrowed).
5. ALLEGIANCE HEADER LABELS: bare "0"/"0" -> "Followers: N" / "Rank: [N]"
(user-specified format; the full retail StringInfo composition stays
AD-85's gap), monarch block matching.
6. FRIENDS/SQUELCH LIVE (AD-79 mostly retired): Add friend (name box ->
0x0018, retail clears the box - Request_AddFriend @0x0048D240),
Remove (row-click selection -> 0x0017), Appear Offline (CharacterOption
0x27 via the immediate 0x0005 auto-save, ACE pushes FriendStatusChanged
to your friend-of list), Squelch Character/Account add-by-name
(0x0058 guid0/type AllChannels + 0x0059) and Remove for the selected
row. The wire beneath (builders, WorldSession sends, Runtime commands,
parsers) existed end-to-end since J4.1/FA1 - this is panel wiring only
(docs/research/2026-08-13-social-wire-completion.md, committed here).
Send Tell stays inert (not in the order; AD-79's remainder).
7. WORLD SELF-SELECTION ("clicking my own char should select myself"):
retail has NO self-exclusion (CPhysicsPart::Draw @0x0050D823 arms
every physobj; RecvNotice_SmartBoxObjectFound @0x004E5BAE selects
unconditionally) - the includeSelf gate was an unregistered
divergence, now removed on both the left-click and right-click paths.
Element roles were probe-measured, never guessed (Add 0x10000514 /
Remove 0x10000515 / Send Tell 0x10000516 / Appear Offline 0x1000052C /
name field 0x1000051B; Squelch: field 0x10000540, Remove 0x10000547,
Squelch Character 0x1000054B, Squelch Account 0x1000054C).
Register: AD-79 mostly retired, AD-82 narrowed. Known remainder, filed
not hidden: the fellowship page's authored 600px content vs the 362px
viewport leaves Dismiss/Assign-Leader below the fold until the window is
resized taller (probe-measured; candidate follow-up).
Tests: Checkbox_Click fact rewritten to the mirror contract (both
directions), monarch-followers label updated, includeSelf expectation
updated, probe extended (click routing, synthetic click, action-widget
role dump). App suite 4,976/3 skips.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
Erik
parent
ec2a7b0cce
commit
72ceddce2e
15 changed files with 1018 additions and 65 deletions
|
|
@ -53,21 +53,49 @@ namespace AcDream.App.UI.Layout;
|
|||
public sealed class SocialSquelchPageController
|
||||
{
|
||||
private const uint ListBoxId = 0x1000053Eu;
|
||||
// 2026-08-13 gate (AD-79 retirement): probe-verified roles
|
||||
// (ProbeSocialClickRouting label dump) — the name box, the Remove button,
|
||||
// and the two add buttons ("Squelch Character" / "Squelch Account").
|
||||
private const uint NameFieldId = 0x10000540u;
|
||||
private const uint RemoveButtonId = 0x10000547u;
|
||||
private const uint SquelchCharacterButtonId = 0x1000054Bu;
|
||||
private const uint SquelchAccountButtonId = 0x1000054Cu;
|
||||
|
||||
/// <summary>2026-08-13 (AD-79 retired for this page): add-by-name rides
|
||||
/// <c>0x0058</c> (character scope, guid 0, type AllChannels — ACE name-
|
||||
/// looks-up) / <c>0x0059</c> (account scope); remove is <c>0x0058/0x0059</c>
|
||||
/// with add=0 for the selected row. Wire details:
|
||||
/// docs/research/2026-08-13-social-wire-completion.md §1.5.</summary>
|
||||
public sealed record Actions(
|
||||
Action<string> SquelchCharacter,
|
||||
Action<string> SquelchAccount,
|
||||
Action<uint, string> RemoveCharacterSquelch,
|
||||
Action<string> RemoveAccountSquelch);
|
||||
|
||||
private readonly UiTemplateListBox _listBox;
|
||||
private readonly SquelchState _squelch;
|
||||
private readonly Actions? _actions;
|
||||
private readonly UiField? _nameField;
|
||||
private long _lastRevision = long.MinValue;
|
||||
private (uint Guid, string Name, bool IsAccount)? _selected;
|
||||
|
||||
private SocialSquelchPageController(UiTemplateListBox listBox, SquelchState squelch)
|
||||
private SocialSquelchPageController(
|
||||
UiTemplateListBox listBox,
|
||||
SquelchState squelch,
|
||||
Actions? actions,
|
||||
UiField? nameField)
|
||||
{
|
||||
_listBox = listBox;
|
||||
_squelch = squelch;
|
||||
_actions = actions;
|
||||
_nameField = nameField;
|
||||
}
|
||||
|
||||
public static SocialSquelchPageController? Bind(
|
||||
UiElement pageRoot,
|
||||
SquelchState squelch,
|
||||
Func<uint, uint, UiElement?> templateResolver)
|
||||
Func<uint, uint, UiElement?> templateResolver,
|
||||
Actions? actions = null)
|
||||
{
|
||||
ArgumentNullException.ThrowIfNull(pageRoot);
|
||||
ArgumentNullException.ThrowIfNull(squelch);
|
||||
|
|
@ -93,11 +121,46 @@ public sealed class SocialSquelchPageController
|
|||
$"[D.2b] SocialSquelchPageController: scrollbar 0x{scrollbarElementId:X8} "
|
||||
+ "not found — the Squelch list will not scroll.");
|
||||
|
||||
var controller = new SocialSquelchPageController(listBox, squelch);
|
||||
var nameField = UiElement.FindDescendant(pageRoot, NameFieldId) as UiField;
|
||||
var controller = new SocialSquelchPageController(listBox, squelch, actions, nameField);
|
||||
controller.WireActions(pageRoot);
|
||||
controller.Refresh();
|
||||
return controller;
|
||||
}
|
||||
|
||||
private void WireActions(UiElement pageRoot)
|
||||
{
|
||||
if (_actions is not { } actions) return; // fixture callers stay inert
|
||||
|
||||
if (UiElement.FindDescendant(pageRoot, SquelchCharacterButtonId) is UiButton addCharacter)
|
||||
addCharacter.OnClick = () =>
|
||||
{
|
||||
string name = _nameField?.Text?.Trim() ?? string.Empty;
|
||||
if (string.IsNullOrWhiteSpace(name)) return;
|
||||
actions.SquelchCharacter(name);
|
||||
_nameField?.SetText(string.Empty);
|
||||
};
|
||||
|
||||
if (UiElement.FindDescendant(pageRoot, SquelchAccountButtonId) is UiButton addAccount)
|
||||
addAccount.OnClick = () =>
|
||||
{
|
||||
string name = _nameField?.Text?.Trim() ?? string.Empty;
|
||||
if (string.IsNullOrWhiteSpace(name)) return;
|
||||
actions.SquelchAccount(name);
|
||||
_nameField?.SetText(string.Empty);
|
||||
};
|
||||
|
||||
if (UiElement.FindDescendant(pageRoot, RemoveButtonId) is UiButton remove)
|
||||
remove.OnClick = () =>
|
||||
{
|
||||
if (_selected is not { } selected) return;
|
||||
if (selected.IsAccount)
|
||||
actions.RemoveAccountSquelch(selected.Name);
|
||||
else
|
||||
actions.RemoveCharacterSquelch(selected.Guid, selected.Name);
|
||||
};
|
||||
}
|
||||
|
||||
public void Tick()
|
||||
{
|
||||
long revision = _squelch.Revision;
|
||||
|
|
@ -112,22 +175,38 @@ public sealed class SocialSquelchPageController
|
|||
SquelchDatabase database = _squelch.Snapshot();
|
||||
|
||||
bool allRowsResolved = true;
|
||||
foreach (SquelchInfo character in database.Characters.Values)
|
||||
allRowsResolved &= AddRow(character.Name);
|
||||
bool selectedStillPresent = false;
|
||||
foreach ((uint guid, SquelchInfo character) in database.Characters)
|
||||
{
|
||||
allRowsResolved &= AddRow(character.Name, guid, isAccount: false);
|
||||
if (_selected is { IsAccount: false } s && s.Guid == guid)
|
||||
selectedStillPresent = true;
|
||||
}
|
||||
foreach (string accountName in database.Accounts.Keys)
|
||||
allRowsResolved &= AddRow(accountName);
|
||||
{
|
||||
allRowsResolved &= AddRow(accountName, 0u, isAccount: true);
|
||||
if (_selected is { IsAccount: true } s && s.Name == accountName)
|
||||
selectedStillPresent = true;
|
||||
}
|
||||
if (!selectedStillPresent) _selected = null;
|
||||
|
||||
// SF-3: only latch the revision once the rebuild actually reflects it —
|
||||
// a resolver miss must not silently swallow a future revision bump.
|
||||
if (allRowsResolved) _lastRevision = revision;
|
||||
}
|
||||
|
||||
private bool AddRow(string name)
|
||||
private bool AddRow(string name, uint guid, bool isAccount)
|
||||
{
|
||||
UiElement? row = _listBox.AddItemFromTemplateList(0);
|
||||
if (row is null) return false;
|
||||
if (SocialPanelRowText.FindDeepest(row) is { } text)
|
||||
{
|
||||
text.LinesProvider = () => [new UiText.Line(name, Vector4.One)];
|
||||
// 2026-08-13 gate: row click selects the entry the Remove button
|
||||
// acts on (UiText.OnClick clears the display-text ClickThrough
|
||||
// default).
|
||||
text.OnClick = () => _selected = (guid, name, isAccount);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue