Merge main: v4.8.0 click-cast cold-start and pinned-frame prune fixes

# Conflicts:
#	DandersFrames.toc

Author: mergetest

CHANGELOG.md

@@ -2,10 +2,17 @@
 
 ## [5.0.0]
 
+## [4.8.0]
+
+### Bug Fixes
+
+* (Click Casting) Fixed all binds being dead in your first arena or dungeon of a session until a reload. (by Krathe)
+* (Pinned Frames) Fixed an empty "drag to move" box getting stuck on screen after a profile switch, surviving reloads. (by Krathe)
+
 ### Improvements
 
-* (Click Casting) Enabling a targeting fallback (Global, Target, Self or Always Cast) on a key that already does something in WoW now asks for confirmation and names exactly what the key will stop doing — these options make the key active everywhere, not just over the frames. The fallback tooltips explain this too.
-* (Click Casting) The "Clear Blizzard Bindings" button now warns that clearing is permanent, and it no longer silently re-clears Blizzard's click-casting profile every time click casting is enabled — clearing only happens when you press the button.
+* (Click Casting) Enabling a targeting fallback on a key that already does something now asks for confirmation and names what the key will stop doing.
+* (Click Casting) "Clear Blizzard Bindings" now warns that clearing is permanent, and only clears when you press it.
 
 ### WoW 12.1 (Midnight) Rework
 
@@ -162,8 +169,7 @@ DandersFrames has been rebuilt for WoW 12.1 (Midnight), which fundamentally chan
 
 ### Bug Fixes
 
-* (Click Casting) **Fixed the 4.7.4 regression where every key bound in DF stopped working on the action bars ("like my keyboard is unplugged") after hovering a party/raid frame, until a reload.** 4.7.4's hover-bind rework applied binds under one owner but released them under another — so leaving a frame looked clean but never actually freed the keys. Bind ownership is now genuinely held by one permanent frame (applied and released in the same secure context), every release point additionally clears both possible owners as insurance, and the combat safety-check regression from 4.7.4 is reverted — keys release the moment the cursor leaves a frame. (by Krathe)
-* (Click Casting) Added extra recovery layers on top: stuck hover binds detected after leaving a frame are released immediately out of combat (or at combat end / next frame hover in combat), and the loading-screen self-repair now releases lingering hover binds unconditionally instead of trusting a state flag. (by Krathe)
+* (Click Casting) **Fixed keybinds going dead after hovering a party or raid frame (a 4.7.4 regression)** — keys now release the moment the cursor leaves a frame, with extra self-recovery layers if binds ever stick again. (by Krathe)
 
 ## [4.7.4]
 

ClickCasting/Bindings.lua

@@ -2386,13 +2386,55 @@ end
 
 -- Process all bindings and build unified macro map
 -- Returns: { [keyString] = { macroText = "...", templateBinding = binding } }
+-- Re-resolve click-casting state once cold-start data becomes available. Two
+-- things can be built before GetSpecialization() resolves at the first login
+-- of a session, and both used to stay wrong all day until a /reload:
+--   * loadoutCheckUnresolved (CheckLoadoutProfileSwitch): the spec→profile
+--     auto-switch could not run (or, before the guard, ran with the `or 1`
+--     spec fallback and switched to the WRONG spec's profile) — the field
+--     report: "none of my binds work in my first arena of the day"
+--   * macroMapUnresolved (BuildUnifiedMacroMap): loadSpec-scoped bindings
+--     were dropped from the map (legacy/import-only config; belt)
+-- Debounced; each resolver clears its own flag on success and self-defers in
+-- combat (pendingLoadoutCheck / needsBindingRefresh). No-op in steady state,
+-- so the extra triggers cost nothing.
+function CC:ResolveProvisionalMap(reason)
+    if not (self.macroMapUnresolved or self.loadoutCheckUnresolved) then return end
+    if not (self.db and self.db.enabled) then return end
+    if self.provisionalResolveTimer then self.provisionalResolveTimer:Cancel() end
+    self.provisionalResolveTimer = C_Timer.NewTimer(0.5, function()
+        CC.provisionalResolveTimer = nil
+        if CC.loadoutCheckUnresolved then
+            DF:Debug("CLICK", "Re-running deferred loadout profile check (%s)", tostring(reason))
+            CC:CheckLoadoutProfileSwitch()
+        end
+        if CC.macroMapUnresolved then
+            DF:Debug("CLICK", "Rebuilding provisional binding map (%s)", tostring(reason))
+            CC:ApplyBindings()
+        end
+    end)
+end
+
 function CC:BuildUnifiedMacroMap()
     local macroMap = {}
-    
+
+    -- Cold-start guard: ShouldBindingLoad drops every loadSpec-scoped binding
+    -- while GetSpecialization() is still nil (first login of a session, before
+    -- spec data resolves). The map is built once and cached, so a map built in
+    -- that window silently loses those bindings — and an all-spec-scoped setup
+    -- comes up EMPTY, which downstream disables clicks on our frames entirely
+    -- ("none of my binds work in my first arena of the day until I reload").
+    -- Record the condition on the module; the resolve watchers (SPELLS_CHANGED /
+    -- PLAYER_SPECIALIZATION_CHANGED / arena prep) rebuild when data arrives, and
+    -- ApplyBindingsToFrameUnified refuses to wipe a frame off a suspect map.
+    local specKnown = GetSpecialization() ~= nil
+    local anySpecScoped = false
+
     -- Group all bindings by their key string
     local keyGroups = {}
     for i, binding in ipairs(self.db.bindings) do
         if binding.enabled ~= false then
+            if binding.loadSpec then anySpecScoped = true end
             local keyString = self:GetBindingKeyString(binding)
             if keyString then
                 if not keyGroups[keyString] then
@@ -2402,6 +2444,11 @@ function CC:BuildUnifiedMacroMap()
             end
         end
     end
+
+    self.macroMapUnresolved = (anySpecScoped and not specKnown) or nil
+    if self.macroMapUnresolved then
+        DF:DebugWarn("CLICK", "BuildUnifiedMacroMap: spec unknown with spec-scoped bindings — map is provisional")
+    end
 
     -- Build macro for each key group
     for keyString, group in pairs(keyGroups) do
@@ -2507,17 +2554,16 @@ function CC:ApplyBindingsToFrameUnified(frame, skipKeyboardUpdate)
             frameName, debugstack(2, 1, 0) or "unknown")
     end
 
-    -- Clear existing bindings first
-    self:ClearBindingsFromFrame(frame)
-    
     -- Build unified macro map if not already built
     if not self.unifiedMacroMap then
         self.unifiedMacroMap = self:BuildUnifiedMacroMap()
         -- Refresh keyboard bindings on all frames since map was just built
         self:RefreshKeyboardBindings()
     end
-    
-    -- Check if this frame has ANY bindings that apply to it
+
+    -- Check if this frame has ANY bindings that apply to it — BEFORE the
+    -- destructive clear below, so a provisional (cold-start) map can bail out
+    -- without touching the frame's existing state.
     local hasAnyBindings = false
     local isDandersFrame = frame.dfIsDandersFrame == true
     local isBlizzardFrame = frame.dfIsBlizzardFrame == true
@@ -2543,6 +2589,16 @@ function CC:ApplyBindingsToFrameUnified(frame, skipKeyboardUpdate)
 
     -- If no bindings apply to this frame
     if not hasAnyBindings then
+        -- Provisional map (spec not yet resolved at build time): the emptiness
+        -- is almost certainly the cold-start drop, not the user's config. Do
+        -- NOT clear/disable anything — leave the frame exactly as it is; the
+        -- resolve watchers rebuild and re-apply once spec data arrives.
+        if self.macroMapUnresolved then
+            DF:Debug("CLICK", "ApplyBindings %s deferred — provisional map (spec unresolved)", frameName)
+            return
+        end
+        -- Genuinely no bindings for this frame: clean it up.
+        self:ClearBindingsFromFrame(frame)
         if isDandersFrame then
             -- For DandersFrames, completely disable clicks when no bindings apply
             -- Our own frames get type1/type2 set in InitializeHeaderChild as a safety net
@@ -2557,7 +2613,11 @@ function CC:ApplyBindingsToFrameUnified(frame, skipKeyboardUpdate)
         end
         return
     end
-    
+
+    -- Clear existing bindings first (moved below the applicability check so a
+    -- provisional-map bailout above never strips a frame's working state)
+    self:ClearBindingsFromFrame(frame)
+
     -- Register for clicks based on castOnDown option
     if frame.RegisterForClicks then
         local castOnDown = self.profile and self.profile.options and self.profile.options.castOnDown

ClickCasting/Events.lua

@@ -29,6 +29,9 @@ function CC:RegisterEvents()
     -- Nameplate events for click-casting on nameplates
     eventFrame:RegisterEvent("NAME_PLATE_UNIT_ADDED")
     eventFrame:RegisterEvent("NAME_PLATE_UNIT_REMOVED")
+
+    -- Spell data arrival — resolves a provisional (cold-start) binding map
+    eventFrame:RegisterEvent("SPELLS_CHANGED")
 
     eventFrame:SetScript("OnEvent", function(_, event, ...)
         if event == "PLAYER_REGEN_ENABLED" then
@@ -39,6 +42,12 @@ function CC:RegisterEvents()
         elseif event == "PLAYER_SPECIALIZATION_CHANGED" or event == "ACTIVE_PLAYER_SPECIALIZATION_CHANGED" then
             -- Spec changed - check for profile switch
             CC:OnSpecChanged()
+            -- Cold-start resolve: a map built before GetSpecialization()
+            -- resolved dropped every spec-scoped binding — rebuild it now
+            CC:ResolveProvisionalMap("spec-resolved")
+        elseif event == "SPELLS_CHANGED" then
+            -- Spell data arrived/changed — no-op unless the map is provisional
+            CC:ResolveProvisionalMap("spells-changed")
         elseif event == "TRAIT_CONFIG_UPDATED" or event == "TRAIT_CONFIG_CREATED" or event == "ACTIVE_COMBAT_CONFIG_CHANGED" then
             -- Loadout/talent changed - check for profile switch and reapply bindings (with debounce)
             if not InCombatLockdown() then
@@ -93,15 +102,26 @@ function CC:RegisterEvents()
                 -- so a broken hover-bind state never survives a zone change
                 CC:RunBindingRepair("zone-in", true)
 
-                -- Check for loadout-based profile on initial load
+                -- Cold-start resolve: if the login build ran before spec data
+                -- was available, the map is provisional — rebuild it on the
+                -- first loading screen so it is correct BEFORE the first
+                -- arena/dungeon of the session, not only after a /reload
+                CC:ResolveProvisionalMap("zone-in")
+
+                -- Check for loadout-based profile on initial load. No combat
+                -- guard here: CheckLoadoutProfileSwitch defers itself via
+                -- pendingLoadoutCheck in lockdown — the old call-site guard
+                -- silently DROPPED the check when zone-in+1s landed in combat
+                -- (the arena-load race), leaving the previous spec's profile
+                -- active for the whole match.
                 C_Timer.After(1, function()
-                    if not InCombatLockdown() then
-                        CC:CheckLoadoutProfileSwitch()
-                    end
+                    CC:CheckLoadoutProfileSwitch()
                 end)
             end)
         elseif event == "ARENA_PREP_OPPONENT_SPECIALIZATIONS" then
             -- Arena frames should now exist
+            -- Belt: never enter an arena on a provisional (cold-start) map
+            CC:ResolveProvisionalMap("arena-prep")
             CC:OnArenaPrep()
         elseif event == "INSTANCE_ENCOUNTER_ENGAGE_UNIT" then
             -- Boss frames should now exist

ClickCasting/Profiles.lua

@@ -492,10 +492,27 @@ end
 -- Check and auto-switch profile based on current loadout
 function CC:CheckLoadoutProfileSwitch()
     if InCombatLockdown() then
-        -- Will be called again when combat ends
+        -- Defer, don't drop: entering an arena/dungeon starts combat quickly,
+        -- and silently losing the check leaves the previous spec's profile
+        -- active for the whole match. OnCombatEnd drains pendingLoadoutCheck.
+        self.pendingLoadoutCheck = true
         return
     end
-    
+
+    -- Cold-start guard: at the first login of a session this can run BEFORE
+    -- GetSpecialization() resolves. GetCurrentSpec()'s `or 1` fallback would
+    -- then MASK the missing data and switch to spec 1's profile — the wrong
+    -- profile for anyone whose actual spec is 2+ ("none of my binds work in
+    -- my first arena of the day until I reload"). Record the unresolved state
+    -- and let the resolve watchers (spec/spell events, loading screens, arena
+    -- prep) re-run this check once real data arrives.
+    if not GetSpecialization() then
+        self.loadoutCheckUnresolved = true
+        DF:Debug("CLICK", "CheckLoadoutProfileSwitch: spec data not ready — deferred to resolve watchers")
+        return
+    end
+    self.loadoutCheckUnresolved = nil
+
     local specIndex = GetCurrentSpec()
     local loadoutID = GetCurrentLoadoutConfigID()
     local assignedProfile, isSpecific = self:GetProfileForLoadout(specIndex, loadoutID)

Core.lua

@@ -5755,6 +5755,16 @@ function DF:FullProfileRefresh()
 
     -- === REFRESH PINNED FRAMES IF ACTIVE ===
     if DF.PinnedFrames and DF.PinnedFrames.initialized then
+        -- Reap sets the NEW profile no longer defines. Profile switching does
+        -- NOT rebuild pinned frames (this function refreshes headers in place),
+        -- so switching from a profile with more sets to one with fewer leaves
+        -- the extra containers/movers live but untracked, and every hide path
+        -- gates on the current profile's GetSetDB — so nothing removes them
+        -- (the "stuck pinned box that survives everything" reports). Prune them
+        -- before refreshing the survivors.
+        if DF.PinnedFrames.PruneOrphanedSets then
+            DF.PinnedFrames:PruneOrphanedSets()
+        end
         -- Sync each set's visibility to the NEW profile FIRST — hide sets it
         -- disables, show/create sets it enables — so a set shown under the
         -- previous profile doesn't linger in a stale state after the switch.