Merge PR #212: v5 release-review fix round (data integrity, stuck-state cleanup, removals, bug fixes)

Author: mergetest

AuraDesigner/Options.lua

@@ -3987,7 +3987,12 @@ local function BuildTypeContent(parent, typeKey, auraName, width, optProxy, yOff
             g:AddWidget(GUI:CreateSlider(parent, L["Scale"], 0.5, 3.0, 0.05, proxy, "scale"), 54)
             g:AddWidget(GUI:CreateSlider(parent, L["Alpha"], 0, 1, 0.05, proxy, "alpha"), 54)
             g:AddWidget(GUI:CreateSlider(parent, L["Frame Level"], -10, 30, 1, proxy, "frameLevel"), 54)
-            g:AddWidget(GUI:CreateDropdown(parent, L["Frame Strata"], OPTS.FRAME_STRATA_OPTIONS, proxy, "frameStrata"), 54)
+            local strataDD = g:AddWidget(GUI:CreateDropdown(parent, L["Frame Strata"], OPTS.FRAME_STRATA_OPTIONS, proxy, "frameStrata"), 54)
+            -- 12.1: indicator z-order is engine-managed (fixed per-family level
+            -- offsets; Frame Level above IS applied). Strata isn't wired on the
+            -- container path yet — planned with the z-order polish pass.
+            GUI:BlockControl12_1(strataDD, "roadmap", { id = "ad:framestrata", page = L["Aura Designer"],
+                when = function() return DF.AuraContainer and DF.AuraContainer.IsSupported and DF.AuraContainer.IsSupported() end })
             g:AddWidget(GUI:CreateCheckbox(parent, L["Hide Cooldown Swipe"], proxy, "hideSwipe"), 28)
             -- Text-only mode: the icon TEXTURE is hidden, so a border (static OR
             -- expiring) would frame nothing. Rebuild the page on toggle so the
@@ -4157,7 +4162,12 @@ local function BuildTypeContent(parent, typeKey, auraName, width, optProxy, yOff
             g:AddWidget(GUI:CreateColorPicker(parent, L["Color"], proxy, "color", true, RPL, RPL, true), 28)
             g:AddWidget(GUI:CreateSlider(parent, L["Alpha"], 0, 1, 0.05, proxy, "alpha"), 54)
             g:AddWidget(GUI:CreateSlider(parent, L["Frame Level"], -10, 30, 1, proxy, "frameLevel"), 54)
-            g:AddWidget(GUI:CreateDropdown(parent, L["Frame Strata"], OPTS.FRAME_STRATA_OPTIONS, proxy, "frameStrata"), 54)
+            local strataDD = g:AddWidget(GUI:CreateDropdown(parent, L["Frame Strata"], OPTS.FRAME_STRATA_OPTIONS, proxy, "frameStrata"), 54)
+            -- 12.1: indicator z-order is engine-managed (fixed per-family level
+            -- offsets; Frame Level above IS applied). Strata isn't wired on the
+            -- container path yet — planned with the z-order polish pass.
+            GUI:BlockControl12_1(strataDD, "roadmap", { id = "ad:framestrata", page = L["Aura Designer"],
+                when = function() return DF.AuraContainer and DF.AuraContainer.IsSupported and DF.AuraContainer.IsSupported() end })
             g:AddWidget(GUI:CreateCheckbox(parent, L["Hide Cooldown Swipe"], proxy, "hideSwipe"), 28)
             g:AddWidget(GUI:CreateCheckbox(parent, L["Hide Icon (Text Only)"], proxy, "hideIcon"), 28)
             g:AddWidget(GUI:CreateCheckbox(parent, L["Show When Missing"], proxy, "showWhenMissing", function()
@@ -4289,7 +4299,12 @@ local function BuildTypeContent(parent, typeKey, auraName, width, optProxy, yOff
             g:AddWidget(GUI:CreateColorPicker(parent, L["Background Color"], proxy, "bgColor", true, RPL, RPL, true), 28)
             g:AddWidget(GUI:CreateSlider(parent, L["Alpha"], 0, 1, 0.05, proxy, "alpha"), 54)
             g:AddWidget(GUI:CreateSlider(parent, L["Frame Level"], -10, 30, 1, proxy, "frameLevel"), 54)
-            g:AddWidget(GUI:CreateDropdown(parent, L["Frame Strata"], OPTS.FRAME_STRATA_OPTIONS, proxy, "frameStrata"), 54)
+            local strataDD = g:AddWidget(GUI:CreateDropdown(parent, L["Frame Strata"], OPTS.FRAME_STRATA_OPTIONS, proxy, "frameStrata"), 54)
+            -- 12.1: indicator z-order is engine-managed (fixed per-family level
+            -- offsets; Frame Level above IS applied). Strata isn't wired on the
+            -- container path yet — planned with the z-order polish pass.
+            GUI:BlockControl12_1(strataDD, "roadmap", { id = "ad:framestrata", page = L["Aura Designer"],
+                when = function() return DF.AuraContainer and DF.AuraContainer.IsSupported and DF.AuraContainer.IsSupported() end })
         end)
         -- Border (Stage 5.3 — unified controls via CreateBorderControls).
         -- Full toolkit (Style / Texture / Colour / Gradient / Shadow / Blend /
@@ -4408,7 +4423,11 @@ local function BuildTypeContent(parent, typeKey, auraName, width, optProxy, yOff
             -- Draw order: lift this border above the frame's own class/role
             -- border so it fully covers it (on by default).  Off tucks it back
             -- underneath the frame border (the pre-5.4 stacking).
-            g:AddWidget(GUI:CreateCheckbox(parent, L["Draw above frame border"], proxy, "drawAboveFrameBorder", RPL), 28)
+            local drawAboveChk = g:AddWidget(GUI:CreateCheckbox(parent, L["Draw above frame border"], proxy, "drawAboveFrameBorder", RPL), 28)
+            -- 12.1: border stacking is engine-managed on the container path —
+            -- not wired yet; planned with the z-order polish pass.
+            GUI:BlockControl12_1(drawAboveChk, "roadmap", { id = "ad:drawaboveborder", page = L["Aura Designer"],
+                when = function() return DF.AuraContainer and DF.AuraContainer.IsSupported and DF.AuraContainer.IsSupported() end })
             swmCheck = GUI:CreateCheckbox(parent, L["Show When Missing"], proxy, "showWhenMissing", function()
                 DF.AuraDesigner.Engine:ForceRefreshAllFrames()
             end)
@@ -5028,8 +5047,15 @@ local function BuildGlobalView(parent)
     AddGroup(L["General"], function(g)
         g:AddWidget(GUI:CreateSlider(parent, L["Default Icon Size"], 8, 64, 1, defaults, "iconSize"), 50)
         g:AddWidget(GUI:CreateSlider(parent, L["Default Scale"], 0.5, 3.0, 0.05, defaults, "iconScale"), 50)
-        g:AddWidget(GUI:CreateSlider(parent, L["Default Frame Level"], -10, 30, 1, defaults, "indicatorFrameLevel"), 50)
-        g:AddWidget(GUI:CreateDropdown(parent, L["Default Frame Strata"], OPTS.FRAME_STRATA_OPTIONS, defaults, "indicatorFrameStrata"), 50)
+        local defLevelSl = g:AddWidget(GUI:CreateSlider(parent, L["Default Frame Level"], -10, 30, 1, defaults, "indicatorFrameLevel"), 50)
+        local defStrataDD = g:AddWidget(GUI:CreateDropdown(parent, L["Default Frame Strata"], OPTS.FRAME_STRATA_OPTIONS, defaults, "indicatorFrameStrata"), 50)
+        -- 12.1: the container render reads only the PER-INDICATOR Frame Level
+        -- (tonumber(indicator.frameLevel) or 0) — these global defaults aren't
+        -- applied (the editor proxy displays them as fallbacks, live ignores
+        -- them) and strata isn't wired at all. Planned with the z-order polish.
+        local zGate = function() return DF.AuraContainer and DF.AuraContainer.IsSupported and DF.AuraContainer.IsSupported() end
+        GUI:BlockControl12_1(defLevelSl, "roadmap", { id = "ad:defaultframelevel", page = L["Aura Designer"], when = zGate })
+        GUI:BlockControl12_1(defStrataDD, "roadmap", { id = "ad:defaultframestrata", page = L["Aura Designer"], when = zGate })
         g:AddWidget(GUI:CreateCheckbox(parent, L["Show Duration"], defaults, "showDuration"), 24)
         g:AddWidget(GUI:CreateCheckbox(parent, L["Show Stacks"], defaults, "showStacks"), 24)
         g:AddWidget(GUI:CreateCheckbox(parent, L["Hide Cooldown Swipe"], defaults, "hideSwipe"), 24)
@@ -9328,23 +9354,3 @@ function DF:AuraDesigner_RefreshPage()
         DF:InvalidateAuraLayout()
     end
 end
-
--- ============================================================
--- TAB DISABLE STATE
--- Standalone function so it can be called from GUI.lua on open
--- and from RefreshPage when the enable checkbox toggles.
--- ============================================================
-
--- Disable the My Buff Indicators tab when AD is enabled (never compatible).
--- Buffs tab is always accessible — it can coexist with AD.
-function DF:ApplyAuraDesignerTabState()
-    local guiRef = DF.GUI
-    if not guiRef or not guiRef.Tabs then return end
-    if not DF.db then return end
-
-    local mode = (guiRef.SelectedMode) or "party"
-    local adCfg = DF.GetModeAuraDesigner and DF:GetModeAuraDesigner(mode)
-    local adEnabled = adCfg and adCfg.enabled
-
-    -- My Buff Indicators tab removed — feature deprecated
-end

CHANGELOG.md

@@ -35,6 +35,17 @@ DandersFrames has been rebuilt for WoW 12.1 (Midnight), which fundamentally chan
 * (Aura Designer) Every indicator has a show/hide eye — turn one off without deleting it.
 * (Aura Designer) The editor header is condensed to a single row; Sound Alerts moved to the Global tab.
 * (Profiles) Custom filters and your category tweaks travel with profile exports — including filters linked in the Aura Designer.
+* (Profiles) Custom filters picked inside a raid auto layout's settings are handled everywhere the rest of the profile is: deleting a filter now removes it from every layout (including the active one), exports carry filters only a layout references, and imports re-link them instead of pointing at the wrong filter on the receiving account.
+* (Frames) The Out of Range "Text Alpha" slider now also governs pet frame text and the test-mode preview — those still followed hidden per-element values no control could change.
+* (Frames) DandersFrames no longer overwrites Blizzard's own raid-frame dispel indicator setting at every login — a leftover from a long-removed option that kept forcing a value you couldn't change.
+* (Interface) The Filter Designer's add-by-ID box now rejects over-long spell IDs like the spell picker does, and a spell picker first opened during combat regains its Escape-to-close afterwards.
+* (Profiles) Role colours (tank/healer/damage) now travel with profile exports.
+* (Aura Designer) The Frame Strata dropdowns, the global Default Frame Level, and "Draw above frame border" are now marked as not yet available on 12.1 — they previously looked live but weren't applied (indicator z-order is engine-managed for now; the per-indicator Frame Level slider does work). Planned to return with a z-order pass.
+* (Interface) Removed the Resurrection icon's "Pending Text" box and the "My Buff Indicators" export category — neither had done anything (the text was never rendered; the category exported no settings).
+* (Auras) Fixed an error ("Attempt to access forbidden object") from the dispel overlay when zoning out of an instance mid-run — the overlay's layout pass could measure a protected aura-button rect during the transition; it now measures safely and falls back to defaults for that one pass.
+* (Bars) Fixed a gap on either side of a "Match Health Bar Width" resource bar at frame border sizes 1-3 (most visible with a non-zero Frame Padding). The bar now sits flush inside the border, and stays aligned with it at any UI scale.
+* (Frames) Fixed grouped raid frames staying invisible after converting a raid to a party and back until a /reload — the frames were alive underneath, but their group anchors were never restored on re-entering the raid.
+* (Frames) Clicks on party and raid frames no longer redirect to a member's vehicle or pet slot while the game flags them as being in a vehicle (sitting on housing furniture counts) — a legacy behaviour Blizzard's own frames dropped, which could target the wrong unit or open a pet menu.
 * (Auras) **The Aura Blacklist has been retired**, replaced by the new filter system. Previously blacklisted buffs will show again — hide them via the Filter Designer instead. Individual debuffs can't be hidden on this version of the game.
 * (Auras) **New: Debuff Filters.** The debuff bar is now filtered by categories on the Aura Filters page — Boss, Role, Priority, Crowd Control, Raid and Dispellable (by you or by anyone). "Show All Debuffs" keeps the old behaviour.
 * (Auras) The "All Dispellable" debuff filter mode now actually filters — it previously showed every debuff.

ClickCasting/Bindings.lua

@@ -289,75 +289,13 @@ function CC:GetBindingDisplayIcon(binding)
     return QM
 end
 
--- BINDING MIGRATION
--- ============================================================
--- Migrate bindings to use root spell IDs instead of override spell IDs
--- This ensures bindings survive talent changes (e.g., Chrono Flames -> Living Flame)
-
-local MIGRATION_VERSION = 1  -- Increment this when adding new migrations
-
-function CC:MigrateBindingsToRootSpells()
-    -- Check if we have access to the saved data
-    if not DandersFrames_ClickCastDB then return end
-    
-    local _, classId = UnitClassBase("player")
-    if not classId then return end
-    
-    local classData = DandersFrames_ClickCastDB[classId]
-    if not classData or not classData.profiles then return end
-    
-    -- Check if migration already done for this class
-    local currentMigration = classData.migrationVersion or 0
-    
-    if currentMigration >= MIGRATION_VERSION then
-        return  -- Already migrated
-    end
-    
-    local totalMigrated = 0
-    
-    -- Migrate ALL profiles for this class
-    for profileName, profile in pairs(classData.profiles) do
-        if profile.bindings then
-            local profileMigrated = 0
-            
-            for i, binding in ipairs(profile.bindings) do
-                if binding.spellName and binding.spellId then
-                    -- Check if this spell has a root spell
-                    if C_Spell.GetBaseSpell then
-                        local rootId = C_Spell.GetBaseSpell(binding.spellId)
-                        if rootId and rootId ~= binding.spellId then
-                            -- Get the root spell's name
-                            local rootInfo = C_Spell.GetSpellInfo(rootId)
-                            if rootInfo and rootInfo.name then
-                                local oldName = binding.spellName
-                                
-                                -- Update binding to use root spell
-                                binding.spellName = rootInfo.name
-                                binding.spellId = rootId
-                                
-                                profileMigrated = profileMigrated + 1
-                                print("|cff33cc66DandersFrames:|r [" .. profileName .. "] Migrated '" .. oldName .. "' -> '" .. rootInfo.name .. "'")
-                            end
-                        end
-                    end
-                end
-            end
-            
-            totalMigrated = totalMigrated + profileMigrated
-        end
-    end
-    
-    -- Mark migration as complete for this class
-    classData.migrationVersion = MIGRATION_VERSION
-    
-    if totalMigrated > 0 then
-        print("|cff33cc66DandersFrames:|r Migrated " .. totalMigrated .. " binding(s) to use root spells for better talent compatibility.")
-        -- Refresh the active profile's bindings reference
-        if self.profile and self.db then
-            self.db.bindings = self.profile.bindings
-        end
-    end
-end
+-- (Removed) CC:MigrateBindingsToRootSpells — the one-time rewrite of saved
+-- bindings to root spell ids. It guarded on DandersFrames_ClickCastDB, a
+-- global that never existed (the real DB is DandersFramesClickCastingDB), so
+-- it silently no-opped for every user since it shipped. Superseded anyway:
+-- root/override resolution happens live at bind time via C_Spell.GetBaseSpell
+-- / GetOverrideSpell (see trueRootId below), so stored ids no longer need a
+-- one-shot rewrite.
 
 -- Check if a binding should be active based on load conditions
 function CC:ShouldBindingLoad(binding)

ClickCasting/Events.lua

@@ -78,9 +78,6 @@ function CC:RegisterEvents()
         elseif event == "PLAYER_ENTERING_WORLD" then
             -- Initial load or reload
             C_Timer.After(0.5, function()
-                -- Run one-time migration to convert bindings to root spells
-                CC:MigrateBindingsToRootSpells()
-                
                 CC:RegisterAllFrames()
                 -- Register Blizzard frames if any binding needs them
                 if CC:AnyBindingNeedsBlizzardFrames() then