fix(ui): OP5 review fixes — thumb sync, batched opacity writes, cull register row, tests
Fixes the OP5 (Chat tab) dual-lens review findings againste71e5a96: - M1 (MUST-FIX): each opacity row's own apply closure now pushes its OWN slider's thumb from the post-link truth (bindings.Current*Opacity()), mirroring the OP4 binding pattern. Before this, a single-slider drag followed by Reset reverted the live value/link but left that slider's own thumb stuck at the dragged position. - S1 (SHOULD-FIX): the Chat tab's two opacity sliders no longer round-trip the whole settings.json on every drag MouseMove tick. UiScrollbar gains IsDragging + a DragCompleted callback (fires once, at the MouseUp that ends an actual thumb drag); the opacity apply closures flush immediately when not mid-drag (Reset/Defaults/discrete edits, same as before) and defer to DragCompleted otherwise, collapsing dozens of per-tick writes into exactly one per drag gesture. Live opacity still applies every tick. - S2 (SHOULD-FIX): filed register row AP-201 and issue #371 for the UiScrollablePanel whole-row-cull-vs-clip divergence the review found (predates OP5, made user-visible by OP5's 240-260px filter blocks). Not fixed in this round (a renderer-level scissor stack is out of scope here) — corrected the OP5 connected-gate script instead so a straddling block's disappear-then-reappear-whole is no longer reported as a self-sizing regression. - S3 (SHOULD-FIX): the chatWindowMainFilter round-trip test already existed ine71e5a96(the review missed it scrolling past line 330); added the genuinely missing coverage instead — a composed test pinning RetailUiRuntime.MountChat's window-0 SettingsStore -> ChatWindowState seed (MountChat itself needs live DAT access and isn't unit-testable directly). - N11: ScrollbarLinkage_ModelPointsAtTheChatListBoxScroll now asserts through the scoped page-slot lookup (UiElement.FindDescendant) instead of the flat layout.FindElement, which passed for the wrong reason given the shared scrollbar id 0x10000201 — matches OP6's own scrollbar-linkage test pattern. Also updated ConfigOptionsPageControllerTests' local ChatOptionsPageController Bindings fake for the new FlushOpacity parameter. Full Release suite: 13,117 passed / 4 skipped / 0 failed (baseline 13,107/4/0 post-OP6 — 10 tests added, zero skips added, zero failures). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
Erik
parent
e318e8628d
commit
6d0b0f9285
10 changed files with 501 additions and 20 deletions
|
|
@ -24,6 +24,28 @@ What does NOT go here:
|
|||
- Every session: scan OPEN issues at start; promote/close anything we touched during the session before ending.
|
||||
- Promoting to a Phase: mark as `DONE (promoted to Phase X)` + commit SHA where the Phase entry landed.
|
||||
|
||||
## #371 — Options-panel row viewport culls whole rows instead of clipping; tall filter blocks can vanish entirely at some scroll offsets
|
||||
|
||||
**Status:** OPEN — filed 2026-08-11 at the OP5 review-fix round (S2).
|
||||
`UiScrollablePanel.LayoutScrollableChildren` (`src/AcDream.App/UI/UiScrollablePanel.cs:69`)
|
||||
has no scissor stack, so a row that straddles the viewport's visible edge is
|
||||
hidden WHOLE (`child.Visible = top >= -0.5f && top + child.Height <=
|
||||
Height + 0.5f`) rather than clipped to its visible portion. Every row in
|
||||
this viewport (used by `UiTemplateListBox`, the Character/Chat/Config
|
||||
Options-panel tabs) was 8-36px until Campaign OP slice OP5 added five
|
||||
self-sized filter blocks (240-260px, AP-195's self-sizing) to the Chat
|
||||
tab — a block that size straddling the viewport edge now disappears
|
||||
entirely for a range of scroll offsets instead of clipping, a visible pop
|
||||
that the pre-OP5 small rows never made noticeable. Register row AP-201.
|
||||
|
||||
**Fix:** add a real per-row clip rect (scissor test, or per-row UV/geometry
|
||||
clip in the draw path) to `UiScrollablePanel.OnDraw`/`LayoutScrollableChildren`
|
||||
so a straddling row renders its visible slice instead of being culled
|
||||
outright. Deliberately NOT attempted in the OP5 fix round (out of scope —
|
||||
a renderer-level change, not a Chat-tab content fix); see AP-201 for the
|
||||
full analysis and the OP5 gate script's step 2 for the exact observable
|
||||
symptom.
|
||||
|
||||
## #360 — @allegiance/@house management dispatchers only port their simple subcommands
|
||||
|
||||
**Status:** OPEN — filed 2026-08-09, Campaign CH slice CH4; corrected
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -387,7 +387,15 @@ chat windows already read when deciding which lines to show.
|
|||
2. **Scroll the list.** All six sections are reachable; the block heights
|
||||
visibly differ from a flat 100px box — each block is exactly tall enough
|
||||
to show all of its own rows with no clipping and no dead space below the
|
||||
last row (AP-195's self-sizing).
|
||||
last row (AP-195's self-sizing). **Known, registered behavior (AP-201,
|
||||
OP5 review fix S2): the row viewport culls whole rows rather than
|
||||
clipping them (no scissor stack yet — `UiScrollablePanel.cs`), so a
|
||||
240-260px filter block that straddles the visible edge at a given scroll
|
||||
position can vanish ENTIRELY at that exact offset rather than showing a
|
||||
partially-clipped view. Keep scrolling a little further and the block
|
||||
reappears whole. This is the registered cull-vs-clip divergence, not a
|
||||
self-sizing regression — do not report a block's disappear-then-
|
||||
reappear-whole behavior as a bug.**
|
||||
3. **Look closely at a row whose mask covers MULTIPLE underlying message
|
||||
types** (Gameplay, Combat, Allegiance, or Fellowship — the composite-mask
|
||||
rows per the research doc) versus a single-bit row (e.g. "Error" or
|
||||
|
|
@ -491,8 +499,12 @@ chat windows already read when deciding which lines to show.
|
|||
- A filter checkbox whose toggle does not change live message routing in
|
||||
the window it belongs to, or that leaks into a DIFFERENT window.
|
||||
- Reset/Defaults not behaving as described in 11-12.
|
||||
- Any block whose height looks clipped or has a large empty gap below its
|
||||
last row (a self-sizing regression).
|
||||
- Any block that is STILL missing rows, or leaves a large empty gap below
|
||||
its last row, once fully scrolled into view (a genuine self-sizing
|
||||
regression). **Not a regression:** a block that disappears entirely at
|
||||
some intermediate scroll position and reappears whole a little further —
|
||||
that is the registered whole-row-cull behavior (AP-201, see step 2), not
|
||||
a clipping bug.
|
||||
- Any setting that reverts to default after a full relaunch (a persistence
|
||||
regression) — remember this is local-only, so a SERVER-side relog is not
|
||||
the right test here (see item 15's note).
|
||||
|
|
|
|||
|
|
@ -155,12 +155,24 @@ public static class ChatOptionsPageController
|
|||
/// live per-window fade); filters route to the shared <see cref="ChatWindowState"/>
|
||||
/// CH6 already consumes. The two DAT-extracted defaults are resolved ONCE by the
|
||||
/// caller (<c>RetailUiRuntime</c>) — <see cref="ChatOptionsDatDefaults"/> — since
|
||||
/// they never change within a session.</summary>
|
||||
/// they never change within a session.
|
||||
/// <para>
|
||||
/// OP5 review fix S1 (2026-08-11): <see cref="SetDefaultOpacity"/>/
|
||||
/// <see cref="SetActiveOpacity"/> apply the value LIVE only — they must never
|
||||
/// perform the settings.json round trip themselves, or a slider drag (dozens of
|
||||
/// <c>MouseMove</c> ticks) becomes dozens of whole-file load+rewrite cycles on the
|
||||
/// UI thread. <see cref="FlushOpacity"/> is the separate settle seam this
|
||||
/// controller calls exactly once per discrete edit (a Reset/Defaults click, or a
|
||||
/// drag's own <c>MouseUp</c> via <see cref="UiScrollbar.DragCompleted"/>) — never
|
||||
/// once per tick — matching retail's own dirty-timer batching (structure doc
|
||||
/// §3.5) for this blob.
|
||||
/// </para></summary>
|
||||
public sealed record Bindings(
|
||||
Func<float> CurrentDefaultOpacity,
|
||||
Func<float> CurrentActiveOpacity,
|
||||
Action<float> SetDefaultOpacity,
|
||||
Action<float> SetActiveOpacity,
|
||||
Action FlushOpacity,
|
||||
float DefaultOpacityDatDefault,
|
||||
float ActiveOpacityDatDefault,
|
||||
Func<int, ulong> CurrentFilter,
|
||||
|
|
@ -287,6 +299,24 @@ public static class ChatOptionsPageController
|
|||
/// <c>ChatOpacityLink</c> and re-applies live), then pushes whatever the OTHER
|
||||
/// value became onto its own row/slider — raising one drags the other, never
|
||||
/// clamps.
|
||||
/// <para>
|
||||
/// OP5 review fix M1 (2026-08-11): each row's own <c>apply</c> closure pushes its
|
||||
/// OWN slider's thumb from the post-link truth (<c>bindings.Current*Opacity()</c>,
|
||||
/// not the raw dragged value — the link may have clamped it), mirroring the OP4
|
||||
/// binding pattern (a sibling widget's own edit pushes its own widget first). Without
|
||||
/// this, <see cref="FloatOptionRow.RestoreSavedValue"/>/<c>RestoreDefaultValue</c>
|
||||
/// (Reset/Defaults on ONLY this row) call <c>apply</c> but never
|
||||
/// <c>refresh</c>, leaving the thumb visually stuck at the pre-revert position.
|
||||
/// </para>
|
||||
/// <para>
|
||||
/// OP5 review fix S1 (2026-08-11): each row's own <c>apply</c> closure flushes the
|
||||
/// batched settings write (<see cref="Bindings.FlushOpacity"/>) immediately UNLESS
|
||||
/// its own slider is mid-drag (<see cref="UiScrollbar.IsDragging"/>) — a Reset/
|
||||
/// Defaults click is never mid-drag, so those keep writing immediately (single
|
||||
/// discrete edit, same as before); a drag tick IS mid-drag, so the write defers to
|
||||
/// the matching <see cref="UiScrollbar.DragCompleted"/> callback wired below,
|
||||
/// collapsing dozens of <c>MouseMove</c>-tick writes into exactly one per gesture.
|
||||
/// </para>
|
||||
/// </summary>
|
||||
private static void BuildOpacitySliders(
|
||||
UiTemplateListBox listBox,
|
||||
|
|
@ -331,7 +361,9 @@ public static class ChatOptionsPageController
|
|||
apply: value =>
|
||||
{
|
||||
bindings.SetDefaultOpacity(value);
|
||||
slider1.SetScalarPosition(bindings.CurrentDefaultOpacity()); // M1: own slider first
|
||||
activeRow!.RefreshFromLink(bindings.CurrentActiveOpacity());
|
||||
if (!slider1.IsDragging) bindings.FlushOpacity(); // S1: settle now unless mid-drag
|
||||
},
|
||||
read: bindings.CurrentDefaultOpacity,
|
||||
refresh: value => slider1.SetScalarPosition(value));
|
||||
|
|
@ -342,7 +374,9 @@ public static class ChatOptionsPageController
|
|||
apply: value =>
|
||||
{
|
||||
bindings.SetActiveOpacity(value);
|
||||
slider2.SetScalarPosition(bindings.CurrentActiveOpacity()); // M1: own slider first
|
||||
defaultRow!.RefreshFromLink(bindings.CurrentDefaultOpacity());
|
||||
if (!slider2.IsDragging) bindings.FlushOpacity(); // S1: settle now unless mid-drag
|
||||
},
|
||||
read: bindings.CurrentActiveOpacity,
|
||||
refresh: value => slider2.SetScalarPosition(value));
|
||||
|
|
@ -350,6 +384,10 @@ public static class ChatOptionsPageController
|
|||
slider1.ScalarChanged = value => defaultRow.SetCurrentValue(value);
|
||||
slider2.ScalarChanged = value => activeRow.SetCurrentValue(value);
|
||||
|
||||
// S1: the drag-end seam — flushes whatever the tick loop above deferred.
|
||||
slider1.DragCompleted = bindings.FlushOpacity;
|
||||
slider2.DragCompleted = bindings.FlushOpacity;
|
||||
|
||||
page.Register(defaultRow);
|
||||
page.Register(activeRow);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -701,9 +701,18 @@ public sealed class RetailUiRuntime : IDisposable
|
|||
/// Campaign OP slice OP5: persists the Chat tab's two opacity-slider values —
|
||||
/// the "worth tightening to auto-save-on-change" gap
|
||||
/// <see cref="SaveChatWindowFilters"/>'s own doc flagged before a live options UI
|
||||
/// existed to edit them. Called from the Chat tab's slider apply closures, so
|
||||
/// every drag tick is captured (matching the filter blocks' own auto-save-on-
|
||||
/// change wiring below, not the old "only on /saveautoui" schedule).
|
||||
/// existed to edit them.
|
||||
/// <para>
|
||||
/// OP5 review fix S1 (2026-08-11): this is now the BATCHED settle point, not a
|
||||
/// per-tick write. <see cref="Layout.ChatOptionsPageController.Bindings.SetDefaultOpacity"/>/
|
||||
/// <c>SetActiveOpacity</c> below apply the value LIVE only; this method is wired as
|
||||
/// <c>FlushOpacity</c> and is called by the controller exactly once per discrete
|
||||
/// edit — a Reset/Defaults click, or a drag's own <c>MouseUp</c> — never once per
|
||||
/// <c>MouseMove</c> tick. Previously this ran a full <c>settings.json</c> load +
|
||||
/// rewrite on every drag tick (dozens-to-hundreds of synchronous whole-file round
|
||||
/// trips on the UI thread for one drag); retail's own structure batches the
|
||||
/// equivalent blob behind a dirty timer (research doc §3.5).
|
||||
/// </para>
|
||||
/// </summary>
|
||||
private void SaveChatOpacity()
|
||||
{
|
||||
|
|
@ -2120,16 +2129,11 @@ public sealed class RetailUiRuntime : IDisposable
|
|||
new Layout.ChatOptionsPageController.Bindings(
|
||||
CurrentDefaultOpacity: () => WindowOpacity.DefaultOpacity,
|
||||
CurrentActiveOpacity: () => WindowOpacity.ActiveOpacity,
|
||||
SetDefaultOpacity: value =>
|
||||
{
|
||||
WindowOpacity.SetDefaultOpacity(value);
|
||||
SaveChatOpacity();
|
||||
},
|
||||
SetActiveOpacity: value =>
|
||||
{
|
||||
WindowOpacity.SetActiveOpacity(value);
|
||||
SaveChatOpacity();
|
||||
},
|
||||
// S1 fix: live apply ONLY — no disk write per call. The controller
|
||||
// calls FlushOpacity (below) once per discrete edit, not once per tick.
|
||||
SetDefaultOpacity: WindowOpacity.SetDefaultOpacity,
|
||||
SetActiveOpacity: WindowOpacity.SetActiveOpacity,
|
||||
FlushOpacity: SaveChatOpacity,
|
||||
DefaultOpacityDatDefault: datDefaultOpacity,
|
||||
ActiveOpacityDatDefault: datActiveOpacity,
|
||||
CurrentFilter: windowId => _bindings.Chat.Windows.GetFilter(windowId),
|
||||
|
|
|
|||
|
|
@ -35,6 +35,26 @@ public sealed class UiScrollbar : UiElement
|
|||
public Action<float>? ScalarChanged { get; set; }
|
||||
public bool Horizontal { get; set; }
|
||||
|
||||
/// <summary>True while a thumb drag is in progress (between a thumb-hit
|
||||
/// <c>MouseDown</c>/drag-start and the matching <c>MouseUp</c>). OP5 review
|
||||
/// fix S1, 2026-08-11: lets a consumer distinguish a per-tick drag edit
|
||||
/// (defer any expensive settle work) from a single discrete edit (settle
|
||||
/// immediately) without threading extra state through the scalar-value
|
||||
/// callback.</summary>
|
||||
public bool IsDragging => _draggingThumb;
|
||||
|
||||
/// <summary>
|
||||
/// Fires once, at the <c>MouseUp</c> that ends a thumb drag — never on a
|
||||
/// <c>MouseUp</c> that was not preceded by an actual drag (a bare click that
|
||||
/// only page-scrolled or jumped, or a stray <c>MouseUp</c> with no prior
|
||||
/// <c>MouseDown</c>). OP5 review fix S1: the drag-end seam neither
|
||||
/// <see cref="ScalarChanged"/> (fires on every tick) nor <see cref="Model"/>
|
||||
/// scrolling provided — the Chat tab's opacity sliders use this to flush a
|
||||
/// batched settings write exactly once per drag gesture instead of once per
|
||||
/// <c>MouseMove</c>.
|
||||
/// </summary>
|
||||
public Action? DragCompleted { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Optional fill rendered beneath the scalar thumb. Retail's combat power
|
||||
/// control is a horizontal scrollbar containing a meter child; the importer
|
||||
|
|
@ -421,9 +441,13 @@ public sealed class UiScrollbar : UiElement
|
|||
}
|
||||
|
||||
case UiEventType.MouseUp:
|
||||
{
|
||||
bool wasDragging = _draggingThumb;
|
||||
_draggingThumb = false;
|
||||
_pressedButton = EndButton.None;
|
||||
if (wasDragging) DragCompleted?.Invoke();
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
|
|
@ -474,9 +498,13 @@ public sealed class UiScrollbar : UiElement
|
|||
}
|
||||
|
||||
case UiEventType.MouseUp:
|
||||
{
|
||||
bool wasDragging = _draggingThumb;
|
||||
_draggingThumb = false;
|
||||
_pressedButton = EndButton.None;
|
||||
if (wasDragging) DragCompleted?.Invoke();
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
|
@ -513,9 +541,13 @@ public sealed class UiScrollbar : UiElement
|
|||
}
|
||||
|
||||
case UiEventType.MouseUp:
|
||||
{
|
||||
bool wasDragging = _draggingThumb;
|
||||
_draggingThumb = false;
|
||||
_pressedButton = EndButton.None;
|
||||
if (wasDragging) DragCompleted?.Invoke();
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
|
|
|
|||
66
tests/AcDream.App.Tests/UI/ChatMainWindowFilterSeedTests.cs
Normal file
66
tests/AcDream.App.Tests/UI/ChatMainWindowFilterSeedTests.cs
Normal file
|
|
@ -0,0 +1,66 @@
|
|||
using System;
|
||||
using System.IO;
|
||||
using AcDream.Core.Chat;
|
||||
using AcDream.UI.Abstractions.Panels.Settings;
|
||||
|
||||
namespace AcDream.App.Tests.UI;
|
||||
|
||||
/// <summary>
|
||||
/// OP5 review fix S3 (2026-08-11): pins the two-line seed
|
||||
/// <c>RetailUiRuntime.MountChat</c> runs for the MAIN chat window's filter
|
||||
/// (<c>RetailUiRuntime.cs:946-948</c>) — <c>ChatSettings.ChatWindowMainFilter</c>
|
||||
/// loaded from the local <see cref="SettingsStore"/> feeds
|
||||
/// <see cref="ChatWindowState.SetFilter"/> for <see cref="ChatWindowState.MainWindowId"/>,
|
||||
/// the SAME "local-only persistence" leg <c>MountFloatingChatWindows</c> already
|
||||
/// runs for windows 1-4 (research doc §4.4/§6.1). <c>MountChat</c> itself needs
|
||||
/// live DAT access and is not unit-testable directly; this pins the seed
|
||||
/// COMPOSITION (store round-trip + <see cref="ChatWindowState"/> write) instead,
|
||||
/// exactly the two statements the production method runs.
|
||||
/// </summary>
|
||||
public sealed class ChatMainWindowFilterSeedTests : IDisposable
|
||||
{
|
||||
private readonly string _tempPath;
|
||||
|
||||
public ChatMainWindowFilterSeedTests()
|
||||
{
|
||||
_tempPath = Path.Combine(
|
||||
Path.GetTempPath(),
|
||||
$"acdream-chat-seed-test-{Guid.NewGuid():N}.json");
|
||||
}
|
||||
|
||||
public void Dispose()
|
||||
{
|
||||
if (File.Exists(_tempPath)) File.Delete(_tempPath);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void MountChatSeed_ReadsStoredMainWindowFilter_IntoChatWindowState()
|
||||
{
|
||||
var store = new SettingsStore(_tempPath);
|
||||
store.SaveChat(ChatSettings.Default with { ChatWindowMainFilter = 0x1ul });
|
||||
|
||||
var windows = new ChatWindowState();
|
||||
|
||||
// RetailUiRuntime.MountChat's own seed, verbatim:
|
||||
// _bindings.Chat.Windows.SetFilter(
|
||||
// ChatWindowState.MainWindowId, chatStore.LoadChat().ChatWindowMainFilter);
|
||||
windows.SetFilter(ChatWindowState.MainWindowId, store.LoadChat().ChatWindowMainFilter);
|
||||
|
||||
Assert.Equal(0x1ul, windows.GetFilter(ChatWindowState.MainWindowId));
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void MountChatSeed_WithNoStoredFile_SeedsTheRetailPostInitDefault()
|
||||
{
|
||||
var store = new SettingsStore(_tempPath); // file does not exist yet
|
||||
var windows = new ChatWindowState();
|
||||
|
||||
windows.SetFilter(ChatWindowState.MainWindowId, store.LoadChat().ChatWindowMainFilter);
|
||||
|
||||
// ChatWindowState's own constructor default for window 0 IS the retail
|
||||
// PostInit default (0xFBFFFFFF) already — this proves the seed is a
|
||||
// faithful no-op on a fresh install, not just that it doesn't crash.
|
||||
Assert.Equal(ChatWindowState.MainWindowDefaultFilter, windows.GetFilter(ChatWindowState.MainWindowId));
|
||||
Assert.Equal(0xFBFFFFFFul, windows.GetFilter(ChatWindowState.MainWindowId));
|
||||
}
|
||||
}
|
||||
|
|
@ -154,6 +154,7 @@ public sealed class ChatOptionsPageControllerTests
|
|||
public float ActiveOpacityDatDefault = 1.0f;
|
||||
public List<float> DefaultOpacitySets { get; } = new();
|
||||
public List<float> ActiveOpacitySets { get; } = new();
|
||||
public int OpacityFlushes { get; private set; }
|
||||
|
||||
public Dictionary<int, ulong> Filters { get; } = new()
|
||||
{
|
||||
|
|
@ -178,6 +179,7 @@ public sealed class ChatOptionsPageControllerTests
|
|||
(DefaultOpacity, ActiveOpacity) = ChatOpacityLinkFor(DefaultOpacity, value, isDefault: false);
|
||||
ActiveOpacitySets.Add(value);
|
||||
},
|
||||
FlushOpacity: () => OpacityFlushes++,
|
||||
DefaultOpacityDatDefault: DefaultOpacityDatDefault,
|
||||
ActiveOpacityDatDefault: ActiveOpacityDatDefault,
|
||||
CurrentFilter: windowId => Filters[windowId],
|
||||
|
|
@ -338,6 +340,27 @@ public sealed class ChatOptionsPageControllerTests
|
|||
}
|
||||
}
|
||||
|
||||
/// <summary>The two opacity-slider widgets, in build order (slider1 =
|
||||
/// Default, slider2 = Active) — both are <see cref="UiScrollbar"/>s built
|
||||
/// with <c>Horizontal = true</c> (import-time from the authored template's
|
||||
/// own wide-vs-tall extent, <c>DatWidgetFactory.cs:214</c>) driven through
|
||||
/// <see cref="UiScrollbar.ScalarChanged"/> rather than <c>Model</c>. Scoped
|
||||
/// to the ListBox's own subtree, so the page-level vertical list scrollbar
|
||||
/// (a DIFFERENT, non-horizontal, sibling-not-descendant element) is never
|
||||
/// collected.</summary>
|
||||
private static List<UiScrollbar> CollectScalarSliders(UiElement listBoxRoot)
|
||||
{
|
||||
var found = new List<UiScrollbar>();
|
||||
Walk(listBoxRoot, found);
|
||||
return found;
|
||||
|
||||
static void Walk(UiElement node, List<UiScrollbar> acc)
|
||||
{
|
||||
if (node is UiScrollbar { Horizontal: true } bar) acc.Add(bar);
|
||||
foreach (UiElement child in node.Children) Walk(child, acc);
|
||||
}
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Bind_SeedsSlidersFromCurrentOpacity_NotTheDatDefault()
|
||||
{
|
||||
|
|
@ -446,6 +469,170 @@ public sealed class ChatOptionsPageControllerTests
|
|||
Assert.Equal(1.0f, bindings.ActiveOpacity);
|
||||
}
|
||||
|
||||
// ── OP5 review fix M1: single-row Reset must revert that row's OWN thumb ─
|
||||
|
||||
[Fact]
|
||||
public void Reset_AfterOnlyDefaultSliderChanged_RevertsTheThumbToo()
|
||||
{
|
||||
// MUST-FIX M1 (OP5 review, 2026-08-11): defaultRow's own apply closure
|
||||
// must push slider1's OWN thumb (mirroring the OP4 binding pattern),
|
||||
// not just the LINKED slider2 via RefreshFromLink. Drag Default DOWN
|
||||
// only, well below Active, so the link never raises Active and
|
||||
// activeRow.Changed stays false — the exact single-row-changed
|
||||
// scenario the review names as reachable and previously uncovered.
|
||||
var fakeBindings = new FakeBindings { DefaultOpacity = 0.3f, ActiveOpacity = 0.9f };
|
||||
ImportedLayout layout = FixtureLoader.LoadOptionsPanelHost();
|
||||
OptionsPanelController controller = OptionsPanelController.Bind(
|
||||
layout,
|
||||
new OptionsPanelController.Callbacks(
|
||||
Toggle: () => { },
|
||||
RequestExitToCharacterSelection: () => { },
|
||||
ExitGame: () => { },
|
||||
UseMouseTurningSettings: () => { },
|
||||
DisplaySystemMessage: _ => { }))!;
|
||||
bool bound = ChatOptionsPageController.Bind(
|
||||
layout, controller.ChatPage, MakeTemplateResolver(), (_, _) => null,
|
||||
fakeBindings.ToBindings());
|
||||
Assert.True(bound);
|
||||
|
||||
var listBox = Assert.IsType<UiTemplateListBox>(
|
||||
layout.FindElement(ChatOptionsPageController.ListBoxElementId));
|
||||
List<UiScrollbar> sliders = CollectScalarSliders(listBox);
|
||||
Assert.Equal(2, sliders.Count);
|
||||
UiScrollbar slider1 = sliders[0];
|
||||
|
||||
var defaultRow = Assert.IsType<FloatOptionRow>(controller.ChatPage.Rows[0]);
|
||||
var activeRow = Assert.IsType<FloatOptionRow>(controller.ChatPage.Rows[1]);
|
||||
|
||||
defaultRow.SetCurrentValue(0.1f);
|
||||
Assert.Equal(0.1f, slider1.ScalarPosition, 3);
|
||||
Assert.True(defaultRow.Changed);
|
||||
Assert.False(activeRow.Changed); // link never touched Active
|
||||
|
||||
controller.ChatPage.Reset();
|
||||
|
||||
Assert.Equal(0.3f, defaultRow.Current);
|
||||
Assert.Equal(0.3f, fakeBindings.DefaultOpacity);
|
||||
Assert.Equal(0.3f, slider1.ScalarPosition, 3); // the thumb reverted too, not just the value
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Reset_AfterOnlyActiveSliderChanged_RevertsTheThumbToo()
|
||||
{
|
||||
// Symmetric case the review also names: drag Active UP only, Reset.
|
||||
var fakeBindings = new FakeBindings { DefaultOpacity = 0.3f, ActiveOpacity = 0.6f };
|
||||
ImportedLayout layout = FixtureLoader.LoadOptionsPanelHost();
|
||||
OptionsPanelController controller = OptionsPanelController.Bind(
|
||||
layout,
|
||||
new OptionsPanelController.Callbacks(
|
||||
Toggle: () => { },
|
||||
RequestExitToCharacterSelection: () => { },
|
||||
ExitGame: () => { },
|
||||
UseMouseTurningSettings: () => { },
|
||||
DisplaySystemMessage: _ => { }))!;
|
||||
bool bound = ChatOptionsPageController.Bind(
|
||||
layout, controller.ChatPage, MakeTemplateResolver(), (_, _) => null,
|
||||
fakeBindings.ToBindings());
|
||||
Assert.True(bound);
|
||||
|
||||
var listBox = Assert.IsType<UiTemplateListBox>(
|
||||
layout.FindElement(ChatOptionsPageController.ListBoxElementId));
|
||||
List<UiScrollbar> sliders = CollectScalarSliders(listBox);
|
||||
Assert.Equal(2, sliders.Count);
|
||||
UiScrollbar slider2 = sliders[1];
|
||||
|
||||
var defaultRow = Assert.IsType<FloatOptionRow>(controller.ChatPage.Rows[0]);
|
||||
var activeRow = Assert.IsType<FloatOptionRow>(controller.ChatPage.Rows[1]);
|
||||
|
||||
activeRow.SetCurrentValue(0.95f);
|
||||
Assert.Equal(0.95f, slider2.ScalarPosition, 3);
|
||||
Assert.True(activeRow.Changed);
|
||||
Assert.False(defaultRow.Changed); // link never touched Default (0.6 < 0.95)
|
||||
|
||||
controller.ChatPage.Reset();
|
||||
|
||||
Assert.Equal(0.6f, activeRow.Current);
|
||||
Assert.Equal(0.6f, fakeBindings.ActiveOpacity);
|
||||
Assert.Equal(0.6f, slider2.ScalarPosition, 3); // the thumb reverted too, not just the value
|
||||
}
|
||||
|
||||
// ── OP5 review fix S1: settings write batches to drag-end, not per tick ─
|
||||
|
||||
[Fact]
|
||||
public void DraggingDefaultSlider_DefersTheSettingsWriteUntilDragEnd()
|
||||
{
|
||||
// SHOULD-FIX S1 (OP5 review, 2026-08-11): N MouseMove ticks inside one
|
||||
// thumb-drag gesture must flush the settings write ZERO times (only
|
||||
// the LIVE opacity applies per tick); the matching MouseUp flushes
|
||||
// exactly once. Drives the REAL UiScrollbar event pipeline (not
|
||||
// FloatOptionRow.SetCurrentValue directly) so UiScrollbar.IsDragging
|
||||
// is genuinely true for the duration, exactly like a real mouse drag.
|
||||
var fakeBindings = new FakeBindings { DefaultOpacity = 0.2f, ActiveOpacity = 1.0f };
|
||||
ImportedLayout layout = FixtureLoader.LoadOptionsPanelHost();
|
||||
OptionsPanelController controller = OptionsPanelController.Bind(
|
||||
layout,
|
||||
new OptionsPanelController.Callbacks(
|
||||
Toggle: () => { },
|
||||
RequestExitToCharacterSelection: () => { },
|
||||
ExitGame: () => { },
|
||||
UseMouseTurningSettings: () => { },
|
||||
DisplaySystemMessage: _ => { }))!;
|
||||
bool bound = ChatOptionsPageController.Bind(
|
||||
layout, controller.ChatPage, MakeTemplateResolver(), (_, _) => null,
|
||||
fakeBindings.ToBindings());
|
||||
Assert.True(bound);
|
||||
|
||||
var listBox = Assert.IsType<UiTemplateListBox>(
|
||||
layout.FindElement(ChatOptionsPageController.ListBoxElementId));
|
||||
List<UiScrollbar> sliders = CollectScalarSliders(listBox);
|
||||
UiScrollbar slider1 = sliders[0];
|
||||
Assert.True(slider1.Width > 16f, $"fixture slider1.Width={slider1.Width} too narrow for this test's thumb math");
|
||||
|
||||
// Click INSIDE the current thumb (no "jump to click position" branch)
|
||||
// so this is a clean drag start with no incidental extra flush.
|
||||
float thumbWidth = MathF.Min(16f, slider1.Width);
|
||||
float travel = MathF.Max(1f, slider1.Width - thumbWidth);
|
||||
float thumbX = travel * slider1.ScalarPosition;
|
||||
int clickX = (int)(thumbX + thumbWidth * 0.5f);
|
||||
|
||||
Assert.True(slider1.OnEvent(new UiEvent(0u, slider1, UiEventType.MouseDown, Data1: clickX)));
|
||||
Assert.True(slider1.IsDragging);
|
||||
Assert.Equal(0, fakeBindings.OpacityFlushes);
|
||||
|
||||
for (int i = 1; i <= 10; i++)
|
||||
{
|
||||
Assert.True(slider1.OnEvent(new UiEvent(0u, slider1, UiEventType.MouseMove, Data1: clickX + i)));
|
||||
Assert.Equal(0, fakeBindings.OpacityFlushes); // N drag ticks = 0 saves
|
||||
}
|
||||
|
||||
// Live opacity DID apply on every tick even though nothing flushed.
|
||||
Assert.NotEqual(0.2f, fakeBindings.DefaultOpacity);
|
||||
|
||||
Assert.True(slider1.OnEvent(new UiEvent(0u, slider1, UiEventType.MouseUp, Data1: clickX + 10)));
|
||||
Assert.False(slider1.IsDragging);
|
||||
Assert.Equal(1, fakeBindings.OpacityFlushes); // drag end = 1 save
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void ResetClick_FlushesImmediately_NotMidDrag()
|
||||
{
|
||||
// A discrete Reset click (never mid-drag) keeps writing immediately —
|
||||
// the SAME single-write-per-discrete-edit shape the pre-fix code had
|
||||
// for every call, matching the review's "the filter checkboxes are
|
||||
// discrete clicks and are fine as written" characterization applied
|
||||
// to Reset/Defaults on the opacity rows too.
|
||||
var fakeBindings = new FakeBindings { DefaultOpacity = 0.3f, ActiveOpacity = 0.9f };
|
||||
(OptionsPanelController controller, FakeBindings bindings, bool bound) = BindRealWith(fakeBindings);
|
||||
Assert.True(bound);
|
||||
var defaultRow = Assert.IsType<FloatOptionRow>(controller.ChatPage.Rows[0]);
|
||||
|
||||
defaultRow.SetCurrentValue(0.1f); // not mid-drag either — flushes immediately
|
||||
Assert.Equal(1, bindings.OpacityFlushes);
|
||||
|
||||
controller.ChatPage.Reset();
|
||||
Assert.Equal(2, bindings.OpacityFlushes);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void CheckingAFilterRow_PublishesSetFilter_ForItsOwnCompactWindowId()
|
||||
{
|
||||
|
|
@ -562,9 +749,28 @@ public sealed class ChatOptionsPageControllerTests
|
|||
Assert.Empty(page.Rows);
|
||||
}
|
||||
|
||||
// The tab host's own private per-page SLOT id (OptionsPanelController's
|
||||
// ChatPageId) — the id that actually survives base-merge in the
|
||||
// host-mounted tree (see ChatOptionsPageController.PageSlotElementId's
|
||||
// own doc for why the standalone layout's root id does not survive).
|
||||
// OptionsPanelController keeps its own copy private; this test-local
|
||||
// literal mirrors it for a scoped lookup exactly the way the controller
|
||||
// itself scopes its scrollbar linkage (ConfigOptionsPageControllerTests
|
||||
// uses the identical pattern for its own scrollbar-linkage tests).
|
||||
private const uint ChatPageSlotId = 0x1000050Cu;
|
||||
|
||||
[Fact]
|
||||
public void ScrollbarLinkage_ModelPointsAtTheChatListBoxScroll()
|
||||
{
|
||||
// OP5 review fix N11 (2026-08-11): 0x10000201 is authored in BOTH the
|
||||
// Chat and Config page slots (research doc §10.1); ImportedLayout's
|
||||
// flat FindElement is last-write-wins across the whole tree, so a
|
||||
// flat lookup here would pass even if the controller's OWN scoped
|
||||
// lookup (ChatOptionsPageController.Bind) regressed to a flat one —
|
||||
// it happens to resolve the same instance today only because Chat is
|
||||
// built last. Assert through the SAME scoped path the controller
|
||||
// itself uses (UiElement.FindDescendant from the page's own slot),
|
||||
// matching OP6's ScrollbarLinkage_ModelPointsAtTheConfigListBoxScroll.
|
||||
ImportedLayout layout = FixtureLoader.LoadOptionsPanelHost();
|
||||
OptionsPanelController controller = OptionsPanelController.Bind(
|
||||
layout,
|
||||
|
|
@ -579,10 +785,11 @@ public sealed class ChatOptionsPageControllerTests
|
|||
layout, controller.ChatPage, MakeTemplateResolver(), (_, _) => null,
|
||||
fakeBindings.ToBindings());
|
||||
|
||||
var chatSlot = UiElement.FindDescendant(controller.TabPanel, ChatPageSlotId)!;
|
||||
var listBox = Assert.IsType<UiTemplateListBox>(
|
||||
layout.FindElement(ChatOptionsPageController.ListBoxElementId));
|
||||
UiElement.FindDescendant(chatSlot, ChatOptionsPageController.ListBoxElementId));
|
||||
var scrollbar = Assert.IsType<UiScrollbar>(
|
||||
layout.FindElement(ChatOptionsPageController.ScrollbarElementId));
|
||||
UiElement.FindDescendant(chatSlot, ChatOptionsPageController.ScrollbarElementId));
|
||||
|
||||
Assert.Same(listBox.Scroll, scrollbar.Model);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -563,6 +563,7 @@ public sealed class ConfigOptionsPageControllerTests
|
|||
CurrentActiveOpacity: () => ActiveOpacity,
|
||||
SetDefaultOpacity: value => DefaultOpacity = value,
|
||||
SetActiveOpacity: value => ActiveOpacity = value,
|
||||
FlushOpacity: () => { },
|
||||
DefaultOpacityDatDefault: 0.5f,
|
||||
ActiveOpacityDatDefault: 1.0f,
|
||||
CurrentFilter: _ => 0xFBFFFFFFul,
|
||||
|
|
|
|||
|
|
@ -103,6 +103,104 @@ public class UiScrollbarTests
|
|||
Assert.True(bar.OnEvent(new UiEvent(0u, bar, UiEventType.MouseUp, Data1: 45)));
|
||||
}
|
||||
|
||||
// ── OP5 review fix S1: the drag-end seam (IsDragging / DragCompleted) ────
|
||||
|
||||
[Fact]
|
||||
public void HorizontalScalar_DragCompleted_FiresOnceAtMouseUp_NotOnEachMove()
|
||||
{
|
||||
int completedCount = 0;
|
||||
var bar = new UiScrollbar
|
||||
{
|
||||
Width = 90f,
|
||||
Height = 14f,
|
||||
Horizontal = true,
|
||||
ScalarChanged = _ => { },
|
||||
DragCompleted = () => completedCount++,
|
||||
};
|
||||
bar.SetScalarPosition(0f); // thumb spans [0, 16]
|
||||
|
||||
// Click INSIDE the thumb — no "jump to click" branch, a clean drag start.
|
||||
Assert.True(bar.OnEvent(new UiEvent(0u, bar, UiEventType.MouseDown, Data1: 5)));
|
||||
Assert.True(bar.IsDragging);
|
||||
Assert.Equal(0, completedCount);
|
||||
|
||||
for (int i = 0; i < 10; i++)
|
||||
{
|
||||
Assert.True(bar.OnEvent(new UiEvent(0u, bar, UiEventType.MouseMove, Data1: 10 + i)));
|
||||
Assert.Equal(0, completedCount); // N drag ticks fire zero completions
|
||||
}
|
||||
|
||||
Assert.True(bar.OnEvent(new UiEvent(0u, bar, UiEventType.MouseUp, Data1: 50)));
|
||||
Assert.False(bar.IsDragging);
|
||||
Assert.Equal(1, completedCount); // drag end fires exactly one
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void HorizontalScalar_DragCompleted_DoesNotFireOnAMouseUpThatWasNeverADrag()
|
||||
{
|
||||
int completedCount = 0;
|
||||
var bar = new UiScrollbar
|
||||
{
|
||||
Width = 90f,
|
||||
Height = 14f,
|
||||
Horizontal = true,
|
||||
ScalarChanged = _ => { },
|
||||
DragCompleted = () => completedCount++,
|
||||
};
|
||||
|
||||
// A bare MouseUp with no prior MouseDown/drag must not fire the callback.
|
||||
bar.OnEvent(new UiEvent(0u, bar, UiEventType.MouseUp, Data1: 10));
|
||||
Assert.Equal(0, completedCount);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void VerticalModel_DragCompleted_FiresOnlyForAnActualThumbDrag_NotAButtonClick()
|
||||
{
|
||||
// Height=200, default 16px decrement/increment buttons -> trackTop=16,
|
||||
// trackLen=168. content=400/view=100 -> ThumbRatio=0.25 -> thumbH=42,
|
||||
// travel=126. At PositionRatio=0 the thumb spans local Y [16, 58].
|
||||
var model = new UiScrollable { ContentHeight = 400, ViewHeight = 100 };
|
||||
int completedCount = 0;
|
||||
var bar = new UiScrollbar { Width = 16f, Height = 200f, Model = model, DragCompleted = () => completedCount++ };
|
||||
|
||||
// A click on the decrement (up-arrow) button is never a drag.
|
||||
Assert.True(bar.OnEvent(new UiEvent(0u, bar, UiEventType.MouseDown, Data1: 0, Data2: 5)));
|
||||
Assert.False(bar.IsDragging);
|
||||
Assert.True(bar.OnEvent(new UiEvent(0u, bar, UiEventType.MouseUp, Data1: 0, Data2: 5)));
|
||||
Assert.Equal(0, completedCount);
|
||||
|
||||
// A click INSIDE the thumb (local Y 30, within [16, 58]) starts a real drag.
|
||||
Assert.True(bar.OnEvent(new UiEvent(0u, bar, UiEventType.MouseDown, Data1: 0, Data2: 30)));
|
||||
Assert.True(bar.IsDragging);
|
||||
Assert.True(bar.OnEvent(new UiEvent(0u, bar, UiEventType.MouseMove, Data1: 0, Data2: 40)));
|
||||
Assert.Equal(0, completedCount);
|
||||
Assert.True(bar.OnEvent(new UiEvent(0u, bar, UiEventType.MouseUp, Data1: 0, Data2: 40)));
|
||||
Assert.Equal(1, completedCount);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void HorizontalModel_DragCompleted_FiresOnceAtMouseUp()
|
||||
{
|
||||
var model = new UiScrollable { ContentHeight = 320, ViewHeight = 80, LineHeight = 32 };
|
||||
int completedCount = 0;
|
||||
var bar = new UiScrollbar
|
||||
{
|
||||
Width = 160f,
|
||||
Height = 16f,
|
||||
Horizontal = true,
|
||||
Model = model,
|
||||
DragCompleted = () => completedCount++,
|
||||
};
|
||||
|
||||
Assert.True(bar.OnEvent(new UiEvent(0u, bar, UiEventType.MouseDown, Data1: 20)));
|
||||
Assert.True(bar.IsDragging);
|
||||
Assert.True(bar.OnEvent(new UiEvent(0u, bar, UiEventType.MouseMove, Data1: 144)));
|
||||
Assert.Equal(0, completedCount);
|
||||
Assert.True(bar.OnEvent(new UiEvent(0u, bar, UiEventType.MouseUp, Data1: 144)));
|
||||
Assert.False(bar.IsDragging);
|
||||
Assert.Equal(1, completedCount);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void HorizontalModel_ButtonsTrackAndThumbDriveSharedScroll()
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue