M6.7: Parchment theme pass

Lights up the M5 codex design system across the wizard. Default palette swaps from dark leather to aged-parchment cream with sealing-wax red selection emphasis, matching the React prototype's default theme variant. CodexTheme.Build() is applied at the wizard root so every step + Aside + popover cascades through it. Theme additions: - Parchment palette in CodexPalette (Dark retained as alt) - Type variations registered for Card, CodexPopover, Pill, PillDetriment, AbilityToken, AbilitySlot, SkillRow — without SetTypeVariation, panel-stylebox lookup falls through to Godot's default dark slate, which is what was happening to every bare PanelContainer before this pass. - panel_hover stylebox on Card (gild border) wired via CodexCard's MouseEntered/Exited helper; panel_selected bumped to 3px seal-red border + soft shadow so selection reads at a glance. Card selection refactor: - Replaced the warm-cream Modulate hint on cards with stylebox swaps via the new CodexCard.SetSelected helper. The Modulate approach was a no-op on cream-on-cream parchment; the stylebox swap looks the same on either palette. - Step intros + Aside section headers now use the existing Eyebrow / H2 / H3 / CardName / CardMeta / CardBody label variations. - Confirm button on Step VIII uses the PrimaryButton variation. Popover + chip behaviour: - PopoverLayer is now MouseFilter=Ignore so clicks/scroll/hover all pass through. Adjacent chips fire reliably even when the previous popover overlaps them spatially. - Dropped the 80ms grace timer; chip MouseExited closes immediately. - TraitChip MouseFilter Stop → Pass so clicks bubble up to the parent card's GuiInput (selecting the card). Misc: - Wizard._Ready inserts a backing Panel so the parchment Bg fills the canvas — Wizard root is a plain Control, which paints nothing. - CodexTheme font lookup tries Cormorant-Medium before -Regular and globalizes res://Fonts/ for runtime FontFile load (the previous fallback used ContentPaths which points at a sibling data tree). - StepStats final-score Label rendered at font_size 22 to match the AbilityToken die. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
2026-05-03 22:04:24 -07:00
parent bb986d49f9
commit e3f0296e6f
17 changed files with 348 additions and 129 deletions
@@ -23,6 +23,7 @@ public partial class AbilitySlot : PanelContainer
    public override void _Ready()
    {
        CustomMinimumSize = new Vector2(56, 56);
+        ThemeTypeVariation = "AbilitySlot";
        MouseFilter = MouseFilterEnum.Stop;
    }

@@ -25,6 +25,7 @@ public partial class AbilityToken : PanelContainer
    public override void _Ready()
    {
        CustomMinimumSize = new Vector2(56, 56);
+        ThemeTypeVariation = "AbilityToken";
        // PASS so clicks propagate up to the parent AbilitySlot's GuiInput
        // handler (click-to-return). Drag detection still triggers on the
        // deepest non-IGNORE Control under the cursor, so PASS works for
@@ -0,0 +1,67 @@
+using Godot;
+
+namespace Theriapolis.GodotHost.Scenes.Widgets;
+
+/// <summary>
+/// Card-style PanelContainer helpers. The codex Theme defines three
+/// styleboxes for type-variation "Card":
+///   - "panel"           → unselected look (Bg2 fill, Rule border)
+///   - "panel_hover"     → gild border, slightly heavier weight
+///   - "panel_selected"  → seal-red border + soft red shadow
+///
+/// State is held in Godot meta on the card so hover and selected can be
+/// driven independently by different call sites (Make wires the hover
+/// signals; SetSelected is called by step Refresh handlers). The active
+/// stylebox is picked by Apply: selected beats hover beats default.
+/// </summary>
+public static class CodexCard
+{
+    private const string SelectedMeta = "codex_card_selected";
+    private const string HoverMeta    = "codex_card_hover";
+
+    /// <summary>
+    /// Creates a PanelContainer with ThemeTypeVariation = "Card" plus
+    /// hover signal wiring. The MouseEntered/MouseExited handlers update
+    /// the hover meta and re-apply the right stylebox.
+    /// </summary>
+    public static PanelContainer Make()
+    {
+        var card = new PanelContainer
+        {
+            ThemeTypeVariation = "Card",
+            MouseFilter = Control.MouseFilterEnum.Stop,
+        };
+        card.MouseEntered += () => SetHover(card, true);
+        card.MouseExited  += () => SetHover(card, false);
+        return card;
+    }
+
+    public static void SetSelected(PanelContainer card, bool selected)
+    {
+        card.SetMeta(SelectedMeta, selected);
+        Apply(card);
+    }
+
+    private static void SetHover(PanelContainer card, bool hover)
+    {
+        card.SetMeta(HoverMeta, hover);
+        Apply(card);
+    }
+
+    private static void Apply(PanelContainer card)
+    {
+        bool selected = card.HasMeta(SelectedMeta) && (bool)card.GetMeta(SelectedMeta);
+        bool hover    = card.HasMeta(HoverMeta)    && (bool)card.GetMeta(HoverMeta);
+
+        // Priority: selected > hover > default. The default branch removes
+        // the override so the type variation's "panel" stylebox applies.
+        StringName picked = selected ? "panel_selected"
+                          : hover    ? "panel_hover"
+                                     : "panel";
+
+        if (picked == "panel" || !card.HasThemeStylebox(picked, "Card"))
+            card.RemoveThemeStyleboxOverride("panel");
+        else
+            card.AddThemeStyleboxOverride("panel", card.GetThemeStylebox(picked, "Card"));
+    }
+}
@@ -6,8 +6,15 @@ namespace Theriapolis.GodotHost.Scenes.Widgets;
 /// Shared overlay layer that owns one reusable trait popover panel.
 /// Per GODOT_PORTING_GUIDE.md §6.1 — TraitChip triggers ask
 /// <see cref="Instance"/> to show the popover at their global rect; the
-/// popover stays open while either the trigger or the popover itself is
-/// hovered (80 ms grace via close timer).
+/// popover hides as soon as the trigger fires MouseExited.
+///
+/// The popover itself is MouseFilter=Ignore so it never intercepts
+/// input — clicks pass through to the chip's parent (card selection),
+/// scroll wheel events go to the underlying ScrollContainer, and the
+/// chip's hover state stays accurate when the cursor moves onto the
+/// popover area (the cursor is registered as "outside the chip", so
+/// MouseExited fires and we hide). This lets adjacent chips fire
+/// reliably even when the previous popover overlaps them spatially.
 ///
 /// One PopoverLayer per scene; lives as a CanvasLayer child of
 /// Wizard.tscn so popovers float above every step's content. Mirrors
@@ -17,7 +24,6 @@ public partial class PopoverLayer : CanvasLayer
 {
    public static PopoverLayer? Instance { get; private set; }

-    private const float GracePeriodSec = 0.08f;
    private const float ArrowOffsetPx  = 6f;
    private const int   ViewportPadPx  = 8;

@@ -25,7 +31,6 @@ public partial class PopoverLayer : CanvasLayer
    private Label _titleLabel = null!;
    private Label _tagLabel = null!;
    private Label _descLabel = null!;
-    private Timer _closeTimer = null!;

    public override void _EnterTree()
    {
@@ -45,14 +50,15 @@ public partial class PopoverLayer : CanvasLayer

    private void BuildPopover()
    {
+        // Ignore so clicks/scroll/hover all pass through to whatever's
+        // beneath. The popover is purely a visual readout; the chip
+        // owns the lifecycle entirely.
        _popup = new PanelContainer
        {
            Visible = false,
-            MouseFilter = Control.MouseFilterEnum.Pass,
+            MouseFilter = Control.MouseFilterEnum.Ignore,
            ZIndex = 100,
        };
-        _popup.MouseEntered += CancelClose;
-        _popup.MouseExited += ScheduleClose;
        AddChild(_popup);

        var v = new VBoxContainer { CustomMinimumSize = new Vector2(240, 0) };
@@ -75,15 +81,10 @@ public partial class PopoverLayer : CanvasLayer
            CustomMinimumSize = new Vector2(220, 0),
        };
        v.AddChild(_descLabel);
-
-        _closeTimer = new Timer { OneShot = true, WaitTime = GracePeriodSec };
-        _closeTimer.Timeout += HidePopover;
-        AddChild(_closeTimer);
    }

    public void ShowFor(Control trigger, string title, string description, string tag, bool detriment)
    {
-        CancelClose();
        _titleLabel.Text = title;
        _descLabel.Text = description;
        _tagLabel.Visible = !string.IsNullOrEmpty(tag) || detriment;
@@ -100,10 +101,11 @@ public partial class PopoverLayer : CanvasLayer
        Reposition(trigger);
    }

-    public void ScheduleClose() => _closeTimer.Start();
-    public void CancelClose()   => _closeTimer.Stop();
-
-    private void HidePopover() => _popup.Visible = false;
+    /// <summary>Hide the popover. Was previously a 80ms-grace timer when
+    /// the popover stayed alive across chip→popover hover transitions, but
+    /// the popover is now non-interactive so there's no transition to
+    /// cover for — close immediately.</summary>
+    public void ScheduleClose() => _popup.Visible = false;

    private void Reposition(Control trigger)
    {
@@ -24,7 +24,12 @@ public partial class TraitChip : PanelContainer

    public override void _Ready()
    {
-        MouseFilter = MouseFilterEnum.Stop;
+        // Pass so click events bubble up to the parent card's GuiInput
+        // (selecting the card). Hover signals fire regardless of filter
+        // mode — they're driven by cursor-rect intersection, not input
+        // event routing.
+        MouseFilter = MouseFilterEnum.Pass;
+        ApplyVariation();
        _label = new Label
        {
            Text = TraitName,
@@ -42,6 +47,12 @@ public partial class TraitChip : PanelContainer
        Tag = tag;
        Detriment = detriment;
        if (_label is not null) _label.Text = name;
+        ApplyVariation();
+    }
+
+    private void ApplyVariation()
+    {
+        ThemeTypeVariation = Detriment ? "PillDetriment" : "Pill";
    }

    private void OnHoverEntered()