Fix defensive factory row spacing and z-order

Two in-game bugs on 12.1, root-caused via investigation:
  - Spacing: layoutRow double-scaled the icon-size term (correct for the buff
    row's legacy math, wrong for defensives, which the legacy path stepped by
    unscaled size). Added a preScaledStep layout flag; the defensive row opts
    into the legacy unscaled-size stride. Buff row math unchanged.
  - Z-order: the factory container's anchor frame had no frame level, so the
    row drew under the health bar and name text. Create now sets it from a
    frameLevelOffset (buffs +40, defensives +51 = legacy contentOverlay+26
    parity, honoring defensiveIconFrameLevel), re-applied on each layout-version
    bump so runtime changes and Rebuilds keep it. Raising the anchor raises the
    whole native subtree. The Defensive Icon frame-level setting is un-blocked,
    since the factory now honors it.

Known limitation (deferred): slider drag-previews don't reach the factory
container, so defensive/buff settings apply on drag-release, not live mid-drag.
The duplicate-aura bug (one aura per matching filter) is parked for PTR-4.

Author: mergetest

Features/Auras.lua

@@ -2563,6 +2563,8 @@ function DF:DriveBuffFactory(frame, db)
             unit = frame.unit,
             filterList = BuildDirectBuffFilters(db),
         })
+        -- Re-apply the z-order level (buffs default to +40 = legacy parity). Not part of the sig.
+        h:GetFrame():SetFrameLevel(math.max(0, frame:GetFrameLevel() + (cfg.frameLevelOffset or 40)))
         local sig = buffFactorySig(cfg)
         if frame.buffFactorySig ~= sig then
             frame.buffFactorySig = sig
@@ -2631,6 +2633,11 @@ function DF:BuildDefensiveRowConfig(db, unit)
         max      = db.defensiveBarMax or 4,
         enabled  = true,
         tooltips = not db.defensiveIconDisableMouse,
+        -- Z-order: match the legacy defensive level — contentOverlay+26 = frame+51 when auto
+        -- (defensiveIconFrameLevel 0), else the user's own offset. Applied to the container's
+        -- anchor frame in AuraContainer:Create + on each layout-version re-apply.
+        frameLevelOffset = (db.defensiveIconFrameLevel and db.defensiveIconFrameLevel ~= 0)
+            and db.defensiveIconFrameLevel or 51,
         layout = {
             size     = db.defensiveIconSize or 24,
             scale    = db.defensiveIconScale or 1,
@@ -2641,6 +2648,7 @@ function DF:BuildDefensiveRowConfig(db, unit)
             wrap     = db.defensiveBarWrap or 5,
             offsetX  = db.defensiveIconX or 0,
             offsetY  = db.defensiveIconY or 0,
+            preScaledStep = false,   -- legacy defensive spacing (unscaled size term; no double-scale)
         },
         style = {
             icon   = { show = true, zoom = true, inset = 0 },
@@ -2697,6 +2705,9 @@ function DF:DriveDefensiveFactory(frame, db)
     if frame.dfDefFactoryVersion ~= ver then
         frame.dfDefFactoryVersion = ver
         local cfg = DF:BuildDefensiveRowConfig(db, frame.unit)
+        -- Re-apply the z-order level (honors runtime defensiveIconFrameLevel changes; survives
+        -- Rebuild since the new container inherits relative to h.frame). Not part of the sig.
+        h:GetFrame():SetFrameLevel(math.max(0, frame:GetFrameLevel() + (cfg.frameLevelOffset or 40)))
         local sig = buffFactorySig(cfg)
         if frame.defensiveFactorySig ~= sig then
             frame.defensiveFactorySig = sig

Frames/AuraContainer.lua

@@ -578,9 +578,18 @@ local function layoutRow(handle)
 
     -- Step matches the legacy Direct-row math: the icon-size term is pre-scaled and each
     -- button is SetScale(scale)'d, so the icon, the step, and the button's children (fonts,
-    -- border, cooldown) all render at `scale` — pixel-matching DF's rows. scale=1 is a no-op.
-    local stepX = sx * scale + spX
-    local stepY = sy * scale + spY
+    -- border, cooldown) all render at `scale` — pixel-matching DF's buff rows. scale=1 is a no-op.
+    -- preScaledStep=false (defensive row) uses the legacy DEFENSIVE stride: the icon-size term
+    -- is UNSCALED, so — offsets living in the button's scaled space — the rendered stride is
+    -- (size+spacing)*scale and the gap is spacing*scale (no double-scale of the size term).
+    local stepX, stepY
+    if L.preScaledStep == false then
+        stepX = sx + spX
+        stepY = sy + spY
+    else
+        stepX = sx * scale + spX
+        stepY = sy * scale + spY
+    end
     for i, b in ipairs(handle.buttons) do
         local idx = i - 1
         local col = idx % wrap
@@ -1087,6 +1096,11 @@ function AuraContainer:Create(parent, config)
     -- Both modes: h.frame occupies the unit-frame rect (row layout anchors are relative
     -- to it; overlay covers it). To reposition: h:ClearAllPoints() then h:SetPoint(...).
     h.frame:SetAllPoints(parent)
+    -- Z-order: legacy renders host aura icons ABOVE contentOverlay (parent+25, name/health
+    -- text). Raising h.frame raises the whole subtree — the native container + AuraButtons +
+    -- their holders are all descendants with relative levels (Blizzard sets no fixed levels).
+    -- Default +40 = legacy buff-icon level; the defensive row passes +51 (= contentOverlay+26).
+    h.frame:SetFrameLevel(math.max(0, parent:GetFrameLevel() + (cfg.frameLevelOffset or 40)))
 
     if InCombatLockdown() then
         -- Can't safely stand up secure container state in combat; build on regen.

Options/Options.lua

@@ -6335,10 +6335,10 @@ function DF:SetupGUIPages(GUI, CreateCategory, CreateSubTab, BuildPage)
     local pageDefensiveIcon = CreateSubTab("auras", "auras_defensiveicon", L["Defensive Icon"])
     -- 12.1: defensive icons now render through DF.AuraContainer (native BIG_DEFENSIVE /
     -- EXTERNAL_DEFENSIVE filters); the legacy path stays as a secret-hardened fallback, so
-    -- the page is usable — no whole-page banner. Only settings the factory can't honor are
-    -- blocked (frame level, below). Left as known gaps (not cleanly addressable): border
-    -- animation (inlined in the shared border helper) and CENTER growth (a dropdown option
-    -- that falls back to RIGHT under the factory).
+    -- the page is usable — no whole-page banner, and nothing is blocked (frame level IS
+    -- honored, via the container's frameLevelOffset). Known gaps the factory doesn't
+    -- reproduce yet (not cleanly addressable, left as-is): border animation (inlined in the
+    -- shared border helper) and CENTER growth (a dropdown option that falls back to RIGHT).
     BuildPage(pageDefensiveIcon, function(self, db, Add, AddSpace, AddSyncPoint)
         -- Copy button at top
         Add(CreateCopyButton(self.child, {"defensiveIcon"}, L["Defensive Icon"], "auras_defensiveicon"), 25, 2)
@@ -6382,12 +6382,9 @@ function DF:SetupGUIPages(GUI, CreateCategory, CreateSubTab, BuildPage)
             if DF.UpdateAllDefensiveBars then DF:UpdateAllDefensiveBars() end
         end, function() DF:LightweightUpdateDefensiveIcons() end, true), 55)
 
-        local defFrameLevelSlider = appearanceGroup:AddWidget(GUI:CreateSlider(self.child, L["Frame Level"], 0, 100, 1, db, "defensiveIconFrameLevel", function()
+        appearanceGroup:AddWidget(GUI:CreateSlider(self.child, L["Frame Level"], 0, 100, 1, db, "defensiveIconFrameLevel", function()
             if DF.UpdateAllDefensiveBars then DF:UpdateAllDefensiveBars() end
         end, function() DF:LightweightUpdateFrameLevel("defensive") end, true), 55)
-        -- The factory manages the container's own frame level, so this can't apply while
-        -- the factory owns the defensive row (12.1).
-        GUI:BlockControl12_1(defFrameLevelSlider, "roadmap", { id = "defensive:framelevel", page = L["Defensive Icon"], when = function(d) return DF:FactoryOwnsDefensiveRow(d) end })
 
         appearanceGroup:AddWidget(GUI:CreateLabel(self.child, L["0=Auto, Higher=On top of more elements"], 230), 25)
         Add(appearanceGroup, nil, 2)