Update frame handling and constants, disable Blizzard frames.

.vscode/settings.json

@@ -543,7 +543,12 @@
     "TargetFrame",
     "FocusFrame",
     "BossTargetFrameContainer",
-    "CompactArenaFrame"
+    "CompactArenaFrame",
+    "PingableType_UnitFrameMixin",
+    "ComboFrame",
+    "TargetFrameToT",
+    "MAX_PARTY_MEMBERS",
+    "MAX_ARENA_ENEMIES"
   ],
   "Lua.workspace.ignoreDir": [".vscode", "libs/*"],
   "Lua.diagnostics.enable": true,

libs/oUF/blizzard.lua

@@ -1,129 +1,126 @@
 local _, ns = ...
 local oUF = ns.oUF
 
--- sourced from FrameXML\ArenaUI.lua
-local MAX_ARENA_ENEMIES = _G.MAX_ARENA_ENEMIES or 5
-
 -- sourced from FrameXML/TargetFrame.lua
-local MAX_BOSS_FRAMES = _G.MAX_BOSS_FRAMES or 5
+local MAX_BOSS_FRAMES = 8
+
+-- sourced from FrameXML/RaidFrame.lua
+local MEMBERS_PER_RAID_GROUP = _G.MEMBERS_PER_RAID_GROUP or 5
 
+local hookedFrames = {}
+local hookedNameplates = {}
+local isArenaHooked = false
+local isBossHooked = false
 local isPartyHooked = false
 
 local hiddenParent = CreateFrame('Frame', nil, UIParent)
 hiddenParent:SetAllPoints()
 hiddenParent:Hide()
 
-local function insecureOnShow(self)
+local function insecureHide(self)
 	self:Hide()
 end
 
+local function resetParent(self, parent)
+	if parent ~= hiddenParent then self:SetParent(hiddenParent) end
+end
+
 local function handleFrame(baseName, doNotReparent)
 	local frame
-	if(type(baseName) == 'string') then
+	if type(baseName) == 'string' then
 		frame = _G[baseName]
 	else
 		frame = baseName
 	end
 
-	if(frame) then
+	if frame then
 		frame:UnregisterAllEvents()
 		frame:Hide()
 
-		if(not doNotReparent) then
+		if not doNotReparent then
 			frame:SetParent(hiddenParent)
+
+			if not hookedFrames[frame] then
+				hooksecurefunc(frame, 'SetParent', resetParent)
+
+				hookedFrames[frame] = true
+			end
 		end
 
 		local health = frame.healthBar or frame.healthbar or frame.HealthBar
-		if(health) then
-			health:UnregisterAllEvents()
-		end
+		if health then health:UnregisterAllEvents() end
 
 		local power = frame.manabar or frame.ManaBar
-		if(power) then
-			power:UnregisterAllEvents()
-		end
+		if power then power:UnregisterAllEvents() end
 
-		local spell = frame.castBar or frame.spellbar
-		if(spell) then
-			spell:UnregisterAllEvents()
-		end
+		local spell = frame.castBar or frame.spellbar or frame.CastingBarFrame
+		if spell then spell:UnregisterAllEvents() end
 
 		local altpowerbar = frame.powerBarAlt or frame.PowerBarAlt
-		if(altpowerbar) then
-			altpowerbar:UnregisterAllEvents()
-		end
+		if altpowerbar then altpowerbar:UnregisterAllEvents() end
 
 		local buffFrame = frame.BuffFrame
-		if(buffFrame) then
-			buffFrame:UnregisterAllEvents()
-		end
+		if buffFrame then buffFrame:UnregisterAllEvents() end
 
-		local petFrame = frame.PetFrame
-		if(petFrame) then
-			petFrame:UnregisterAllEvents()
-		end
+		local petFrame = frame.petFrame or frame.PetFrame
+		if petFrame then petFrame:UnregisterAllEvents() end
+
+		local totFrame = frame.totFrame
+		if totFrame then totFrame:UnregisterAllEvents() end
+
+		local classPowerBar = frame.classPowerBar
+		if classPowerBar then classPowerBar:UnregisterAllEvents() end
+
+		local ccRemoverFrame = frame.CcRemoverFrame
+		if ccRemoverFrame then ccRemoverFrame:UnregisterAllEvents() end
+
+		local debuffFrame = frame.DebuffFrame
+		if debuffFrame then debuffFrame:UnregisterAllEvents() end
 	end
 end
 
 function oUF:DisableBlizzard(unit)
-	if(not unit) then return end
+	if not unit then return end
 
-	if(unit == 'player') then
+	if unit == 'player' then
 		handleFrame(PlayerFrame)
-
-		-- For the damn vehicle support:
-		PlayerFrame:RegisterEvent('PLAYER_ENTERING_WORLD')
-		PlayerFrame:RegisterEvent('UNIT_ENTERING_VEHICLE')
-		PlayerFrame:RegisterEvent('UNIT_ENTERED_VEHICLE')
-		PlayerFrame:RegisterEvent('UNIT_EXITING_VEHICLE')
-		PlayerFrame:RegisterEvent('UNIT_EXITED_VEHICLE')
-
-		-- User placed frames don't animate
-		PlayerFrame:SetUserPlaced(true)
-		PlayerFrame:SetDontSavePosition(true)
-	elseif(unit == 'pet') then
+	elseif unit == 'pet' then
 		handleFrame(PetFrame)
-	elseif(unit == 'target') then
+	elseif unit == 'target' then
 		handleFrame(TargetFrame)
-		handleFrame(ComboFrame)
-	elseif(unit == 'focus') then
+	elseif unit == 'focus' then
 		handleFrame(FocusFrame)
-		handleFrame(TargetofFocusFrame)
-	elseif(unit == 'targettarget') then
-		handleFrame(TargetFrameToT)
-	elseif(unit:match('boss%d?$')) then
-		local id = unit:match('boss(%d)')
-		if(id) then
-			handleFrame('Boss' .. id .. 'TargetFrame')
-		else
+	elseif unit:match('boss%d?$') then
+		if not isBossHooked then
+			isBossHooked = true
+
+			-- it's needed because the layout manager can bring frames that are
+			-- controlled by containers back from the dead when a user chooses
+			-- to revert all changes
+			-- for now I'll just reparent it, but more might be needed in the
+			-- future, watch it
+			handleFrame(BossTargetFrameContainer)
+
+			-- do not reparent frames controlled by containers, the vert/horiz
+			-- layout code will go insane because it won't be able to calculate
+			-- the size properly, 0 or negative sizes in turn will break the
+			-- layout manager, fun...
 			for i = 1, MAX_BOSS_FRAMES do
-				handleFrame(string.format('Boss%dTargetFrame', i))
+				handleFrame('Boss' .. i .. 'TargetFrame', true)
 			end
 		end
-    elseif (unit:match('party%d?$')) then
-		if oUF.isRetail then
-			if(not isPartyHooked) then
-				isPartyHooked = true
-
-				PartyFrame:UnregisterAllEvents()
-
-				for frame in PartyFrame.PartyMemberFramePool:EnumerateActive() do
-					handleFrame(frame)
-				end
-			end
+	elseif unit:match('party%d?$') then
+		local id = unit:match('party(%d)')
+		if id then
+			handleFrame('PartyMemberFrame' .. id)
 		else
-			local id = unit:match('party(%d)')
-			if(id) then
-				handleFrame('PartyMemberFrame' .. id)
-			else
-				for i = 1, MAX_PARTY_MEMBERS do
-					handleFrame(string.format('PartyMemberFrame%d', i))
-				end
+			for i = 1, MAX_PARTY_MEMBERS do
+				handleFrame(string.format('PartyMemberFrame%d', i))
 			end
 		end
-	elseif(unit:match('arena%d?$')) then
+	elseif unit:match('arena%d?$') then
 		local id = unit:match('arena(%d)')
-		if(id) then
+		if id then
 			handleFrame(oUF.isRetail and 'ArenaEnemyMatchFrame' or 'ArenaEnemyFrame' .. id)
 		else
 			for i = 1, MAX_ARENA_ENEMIES do
@@ -133,15 +130,18 @@ function oUF:DisableBlizzard(unit)
 
 		-- this disables ArenaEnemyFramesContainer
 		SetCVar('showArenaEnemyFrames', '0')
-	elseif(unit:match('nameplate%d+$')) then
-		local frame = C_NamePlate.GetNamePlateForUnit(unit)
-		if(frame and frame.UnitFrame) then
-			if(not frame.UnitFrame.isHooked) then
-				frame.UnitFrame:HookScript('OnShow', insecureOnShow)
-				frame.UnitFrame.isHooked = true
-			end
+	end
+end
 
-			handleFrame(frame.UnitFrame, true)
-		end
+function oUF:DisableNamePlate(frame)
+	if not (frame and frame.UnitFrame) then return end
+	if frame.UnitFrame:IsForbidden() then return end
+
+	if not hookedNameplates[frame] then
+		frame.UnitFrame:HookScript('OnShow', insecureHide)
+
+		hookedNameplates[frame] = true
 	end
-end
+
+	handleFrame(frame.UnitFrame, true)
+end