Nameplates: stay in the world stratum, raise the target by level

The overlay inherits the engine plate's world stratum, below every UI
stratum. Moving it to BACKGROUND/LOW put it level-for-level against the
chat panels, so plates drew over the chat. The target now rises above
the other plates by raising its engine frame and re-parenting the
overlay, which carries the subtree's levels along. Debuff icons take
their level from the health bar so ones grown on a raised plate stay
above it.

api/cooldown.lua

@@ -58,14 +58,17 @@ function pfUI.api.GetCooldownFontSize(height)
   return size
 end
 
--- sizes the numbers to the cooldown's parent; the size follows its height,
--- so a timer start calls this again whenever that height changed
-local function UpdateFont(cooldown)
-  local height = (cooldown:GetParent() or cooldown):GetHeight()
-  cooldown.pfCountdownHeight = height
+-- sizes the numbers to the height of the frame the cooldown covers
+local function UpdateFont(cooldown, height)
   cooldown:GetCountdownFontString():SetFont(pfUI.media[C.cooldown.font], pfUI.api.GetCooldownFontSize(height), "OUTLINE")
 end
 
+-- a pfUI cooldown covers its parent, so it resizes with it; a hidden one is
+-- laid out, and this runs, as it shows
+local function OnSizeChanged(cooldown, width, height)
+  UpdateFont(cooldown, height)
+end
+
 -- applies the settings of its kind to one of pfUI's cooldowns
 local function SetupCooldown(cooldown)
   local kind = cooldown.pfCooldownKind
@@ -78,7 +81,7 @@ local function SetupCooldown(cooldown)
   cooldown:SetReverse(config.reverse == "1")
   cooldown:SetMinimumCountdownDuration(spell[kind] and tonumber(C.cooldown.threshold) * 1000 or 0)
   cooldown:SetCountdownFormatter(GetFormatter())
-  UpdateFont(cooldown)
+  UpdateFont(cooldown, cooldown:GetParent():GetHeight())
 end
 
 -- applies the "foreign" settings to another addon's cooldown. They only take
@@ -100,18 +103,15 @@ local function SetupForeign(cooldown)
 
   cooldown:SetMinimumCountdownDuration(tonumber(C.cooldown.threshold) * 1000)
   cooldown:SetCountdownFormatter(GetFormatter())
-  UpdateFont(cooldown)
+  UpdateFont(cooldown, (cooldown:GetParent() or cooldown):GetHeight())
 end
 
 -- runs as a pfUI cooldown's timer starts: a timer with a total brings back
--- the sweep a time-left-only one took away, and the font follows a changed
--- height
+-- the sweep a time-left-only one took away
 local function StartTimer(cooldown, timeleftOnly)
   if cooldown.pfTimeLeftOnly ~= timeleftOnly then
     cooldown.pfTimeLeftOnly = timeleftOnly
     SetupCooldown(cooldown)
-  elseif cooldown:GetParent():GetHeight() ~= cooldown.pfCountdownHeight then
-    UpdateFont(cooldown)
   end
 end
 
@@ -140,6 +140,7 @@ end)
 function pfUI.api.CreateCooldown(parent, kind, name)
   local cooldown = CreateFrame("Cooldown", name, parent, "CooldownFrameTemplate")
   cooldown.pfCooldownKind = kind
+  cooldown:SetScript("OnSizeChanged", OnSizeChanged)
   table.insert(cooldowns, cooldown)
   SetupCooldown(cooldown)
   return cooldown

api/unitframes.lua

@@ -248,6 +248,11 @@ local VISIBILITY_EVENTS = {
   UNIT_TARGET = true, -- a link of a chained frame's unit retargeted
 }
 
+-- The units of a chain that unit events name by token, whatever nampower does
+-- with its GUID events: the focus, and the focus's target, whose unit events
+-- ClassicAPI fires as "focustarget" from the unit's own fields.
+local CHAIN_TOKENS = { focus = true, focustarget = true }
+
 -- The events a frame hears hidden or not: the visibility events that concern
 -- the unit it was created for (raid.lua remaps a raid frame's label, so this is
 -- decided once, at creation), and the logout guard. UNIT_TARGET belongs to
@@ -482,7 +487,9 @@ function pfUI.uf:UpdateVisibility()
   --
   -- A chained unit -- another unit's target, "targettarget" or "party1target"
   -- -- has no token that unit events name, so the frame follows it by GUID,
-  -- which every unit event also fires with. It follows the unit only while
+  -- which nampower fires every unit event with too, unless its GUID events
+  -- are off or filtered. The focus's target is named (CHAIN_TOKENS), so that
+  -- frame follows its token instead. It follows the unit only while
   -- the client has it: a link's target can be out of sight, and its coming
   -- back is then a new unit too. The unit changes with no event of its own
   -- whenever a link of the chain retargets; UNIT_TARGET on every link reports
@@ -491,8 +498,9 @@ function pfUI.uf:UpdateVisibility()
   self.chain = visibility ~= "hide" and unitstr:match("^(.+)target$") or nil
   if self.chain then
     local guid = UnitName(unitstr) and UnitGUID(unitstr)
-    if guid ~= self.eventunit then self.update_full = true end
-    self:RegisterUnitEvents(guid)
+    if guid ~= self.unitguid then self.update_full = true end
+    self.unitguid = guid
+    self:RegisterUnitEvents(guid and CHAIN_TOKENS[unitstr] and unitstr or guid)
   else
     self:RegisterUnitEvents(visibility ~= "hide" and unitstr or nil)
   end
@@ -1359,8 +1367,8 @@ local UNIT_EVENTS = {
 
 -- Auras and power. ClassicAPI's UNIT_AURA_DELTA also reports refreshes and new
 -- durations and says what changed; its generic power events name the power, so
--- a frame skips the ones it does not draw. Both fire for tokens only, so a
--- chained unit, followed by GUID, keeps 1.12's events instead. A group
+-- a frame skips the ones it does not draw. Both fire for tokens only, and not
+-- as "focustarget", so a chained unit keeps 1.12's events instead. A group
 -- member's connection and sight come with them, and a chained unit has
 -- neither event.
 local TOKEN_EVENTS = {
@@ -1425,16 +1433,18 @@ end
 -- unit, whose `owner` is the unit it is the target of -- for
 -- "targettargettarget" the links are "targettarget" and "target" -- or drop it
 -- when `owner` is nil. By GUID, since the inner links are no token that events
--- name. Cheap to call repeatedly: it re-registers only when a link changed.
+-- name, save the ones in CHAIN_TOKENS. Cheap to call repeatedly: it
+-- re-registers only when a link changed.
 local chainlinks = {}
 function pfUI.uf:RegisterChainEvents(owner)
   local n, key = 0, nil
   while owner do
     local guid = UnitGUID(owner)
     if guid then
+      local link = CHAIN_TOKENS[owner] and owner or guid
       n = n + 1
-      chainlinks[n] = guid
-      key = key and key .. guid or guid
+      chainlinks[n] = link
+      key = key and key .. link or link
     end
     owner = owner:match("^(.+)target$")
   end

modules/focus.lua

@@ -17,9 +17,10 @@ pfUI:RegisterModule("focus", function ()
   -- PLAYER_FOCUS_CHANGED drives immediate refresh on focus assign / clear.
   -- Between events, ClassicAPI fires UNIT_* (health/mana/aura/...) with
   -- arg1 == "focus", so the bars update event-driven like target.
-  -- focustarget is a chained unit like targettarget: UNIT_TARGET follows the
-  -- focus retargeting, and a new focus only needs its visibility re-checked,
-  -- which queues the full refresh when its target is a different unit.
+  -- focustarget is a chained unit like targettarget, but ClassicAPI fires its
+  -- UNIT_* as "focustarget", and UNIT_TARGET on "focus" follows the focus
+  -- retargeting. A new focus only needs its visibility re-checked, which
+  -- queues the full refresh when its target is a different unit.
   pfUI.events:RegisterFrameEventAndCallback("PLAYER_FOCUS_CHANGED", function()
     pfUI.uf:RefreshUnit(pfUI.uf.focus, "all")
     pfUI.uf.focustarget:UpdateVisibility()

modules/nameplates.lua

@@ -671,7 +671,8 @@ pfUI:RegisterModule("nameplates", function ()
   local function CreateDebuffIcon(plate, index)
     local icon = CreateFrame("Frame", plate.platename.."Debuff"..index, plate)
     icon:Hide()
-    icon:SetFrameLevel(4)
+    -- relative: a raised target plate can grow icons too
+    icon:SetFrameLevel(plate.health:GetFrameLevel())
 
     icon.icon = icon:CreateTexture(nil, "BACKGROUND")
     icon.icon:SetColorTexture(.3,1,.8,1)
@@ -684,7 +685,7 @@ pfUI:RegisterModule("nameplates", function ()
     icon.stacks:SetTextColor(1,1,0)
 
     icon.cd = CreateCooldown(icon, "nameplate", plate.platename.."Debuff"..index.."Cooldown")
-    icon.cd:SetFrameLevel(6)
+    icon.cd:SetFrameLevel(icon:GetFrameLevel() + 2)
 
     plate.debuffs[index] = icon
   end
@@ -799,11 +800,22 @@ pfUI:RegisterModule("nameplates", function ()
     plate:SetAlpha(alpha)
   end
 
-  local function UpdateStrata(plate)
-    local strata = plate.istarget and "LOW" or "BACKGROUND"
-    if plate.strata == strata then return end
-    plate.strata = strata
-    plate:SetFrameStrata(strata)
+  -- The engine's plates draw in the world frame's stratum, under every UI
+  -- stratum, and the overlay inherits it; a SetFrameStrata would lift it into
+  -- the UI's and over the chat. The target rises above the other plates by
+  -- level instead: raise the engine frame, then re-parent the overlay, which
+  -- moves its whole subtree to the new parent level.
+  local TARGET_RAISE = 20
+
+  local function UpdateStacking(plate)
+    local raised = plate.istarget and true or nil
+    if plate.raised == raised then return end
+    plate.raised = raised
+    local parent = plate.parent
+    parent:SetFrameLevel(plate.baselevel + (raised and TARGET_RAISE or 0))
+    -- SetParent does nothing for the same parent, so it goes through nil
+    plate:SetParent(nil)
+    plate:SetParent(parent)
   end
 
   -- ============================================================================
@@ -957,7 +969,7 @@ pfUI:RegisterModule("nameplates", function ()
   -- ============================================================================
   local function SetTarget(plate, istarget)
     plate.istarget = istarget
-    UpdateStrata(plate)
+    UpdateStacking(plate)
     UpdateBorder(plate)
     UpdateLayout(plate)
     UpdateCombo(plate)
@@ -1028,7 +1040,7 @@ pfUI:RegisterModule("nameplates", function ()
     UpdateLayout(plate)
     UpdateDebuffs(plate)
     UpdateCombo(plate)
-    UpdateStrata(plate)
+    UpdateStacking(plate)
     UpdateAlpha(plate)
     UpdateCast(plate)
     if cfg.targetzoom and plate.istarget then StartZoom(plate, true) end
@@ -1160,6 +1172,7 @@ pfUI:RegisterModule("nameplates", function ()
     nameplate.platename = platename
     nameplate:EnableMouse(false)
     nameplate.parent = parent
+    nameplate.baselevel = parent:GetFrameLevel()
     nameplate.cache = {}
 
     -- Each plate watches its own unit. With RegisterUnitEvent the token IS the