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

fix(ui): night-round review — F5/F6 structural single-tooltip invariant

Browse source 
F5: moved the unconditional RemovePopup() call into
RetailTooltipPresenter.TryBuildAndMountPopup itself so the single-
popup invariant (retail's own single m_pTooltipElement slot) is
enforced structurally rather than relying on every caller to have
already cleared a stale popup. Closes a real hole: UpdateWorldHoverTooltip's
own clear is gated on _worldTooltipShowing (only true when the WORLD
path itself mounted the current popup), and its "a UI popup cannot be
showing here" comment assumed the host's hover query is null whenever
that branch runs — an assumption that breaks the instant a modal opens
over a stationary cursor. UiRoot.Modal claims EXCLUSIVE hit-testing, so
Pick(MouseX, MouseY) can return null even though a UI-dwell tooltip is
still mounted underneath; UpdateWorldHoverTooltip would then mount a
second popup on top without ever clearing the first.

F6: fixed WorldHover_ThenUiDwellTooltip_ReplacesRatherThanStacks to
actually exercise the transition with a follow-up presenter.Tick()
(the old test only proved OnTooltipShow's own clear worked, never
checked the world-side bookkeeping after). Added
UiDwellTooltip_ThenModalStealsHitTesting_WorldHoverReplacesRatherThanStacks
for F5's own case, using UiRoot.Modal to reproduce the exclusive-hit-
testing hole precisely — empirically verified this new test fails
(2 popups instead of 1) with the structural RemovePopup() reverted,
confirming it is a real regression test.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
Erik 2026-08-17 04:45:49 +02:00
parent 4a24614fd1
commit ab84b54dfa
2 changed files with 77 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

52
tests/AcDream.App.Tests/UI/Layout/RetailTooltipPresenterTests.cs
View file

@ -757,6 +757,58 @@ public sealed class RetailTooltipPresenterTests
// childrenBefore world-target(none) + target(1) + popup(1) == +2 total,
// never +3 (world popup replaced, not stacked).
Assert.Equal(childrenBefore + 2, root.Children.Count);
// Night-round review F6: the test previously stopped here, which
// only proved OnTooltipShow's OWN unconditional RemovePopup()
// cleared the world popup — it never actually exercised what
// happens on the NEXT presenter.Tick() (UpdateWorldHoverTooltip
// still thinks a world-hover target exists, since its own
// _worldHoverGuid/_worldTooltipShowing bookkeeping was never
// re-evaluated after the transition). The mouse is now over the UI
// target, so Pick(...) finds it and WorldHoverGuidProvider is
// ignored (found=0u) — this must leave the UI popup exactly as-is,
// no incorrect extra removal or re-mount.
presenter.Tick();
Assert.Equal(childrenBefore + 2, root.Children.Count);
Assert.Same(popup, root.Children.Single(c => !ReferenceEquals(c, target)));
}
[Fact]
public void UiDwellTooltip_ThenModalStealsHitTesting_WorldHoverReplacesRatherThanStacks()
{
// Night-round review F5's own reproduction: the UI->world hole. A
// UI element's dwell tooltip is showing; a modal then opens WITHOUT
// the mouse moving (UiRoot.Modal claims EXCLUSIVE hit-testing —
// HitTestTopDown @0x... "Modal gets exclusive hit-test" — so
// Pick(MouseX, MouseY) now returns null even though the tooltip's
// owner widget is still mounted, still visible, and its popup is
// still up). UpdateWorldHoverTooltip's own clear is gated on
// _worldTooltipShowing, which is FALSE here (the currently-mounted
// popup is UI-owned, not world-owned) — pre-fix, this let the world
// path mount a SECOND popup on top without ever clearing the first.
var (root, presenter, _) = CreateHarness();
var target = AddFullyAuthoredTarget(root);
int childrenBefore = root.Children.Count;
root.OnMouseMove(110, 110);
root.Tick(0.016, 0);
root.Tick(0.016, root.TooltipDelayMs);
Assert.Equal(childrenBefore + 1, root.Children.Count); // UI tooltip up
// Modal opens elsewhere on screen, stealing exclusive hit-testing —
// the mouse never moves.
root.Modal = new UiPanel { Left = 0, Top = 0, Width = 10, Height = 10 };
presenter.WorldHoverGuidProvider = () => WorldFoundGuid;
presenter.WorldHoverNameResolver = _ => "A Drudge";
presenter.WorldTooltipsEnabled = () => true;
presenter.Tick();
// Exactly one popup (the world one, having replaced the UI one) —
// never two stacked.
Assert.Equal(childrenBefore + 1, root.Children.Count);
UiElement popup = root.Children.Single(c => !ReferenceEquals(c, target));
Assert.NotNull(popup);
}
[Fact]