Merge branch 'main' into ptr

Author: kodewdle

ElvUI/Cata/Modules/Skins/Menu.lua

@@ -20,23 +20,29 @@ local function SkinFrame(frame)
 	end
 end
 
-local function OpenMenu(manager, region, menuDescription)
+function S:SkinMenu(manager, ownerRegion, menuDescription, anchor)
 	local menu = manager:GetOpenMenu()
-	if menu then
-		-- Initial context menu
-		SkinFrame(menu)
-		-- SubMenus
-		menuDescription:AddMenuAcquiredCallback(SkinFrame)
-	end
+	if not menu then return end
+
+	SkinFrame(menu) -- Initial context menu
+	menuDescription:AddMenuAcquiredCallback(SkinFrame) -- SubMenus
+end
+
+function S:OpenMenu(ownerRegion, menuDescription, anchor)
+	S:SkinMenu(self, ownerRegion, menuDescription, anchor) -- self is manager (Menu.GetManager)
+end
+
+function S:OpenContextMenu(ownerRegion, menuDescription)
+	S:SkinMenu(self, ownerRegion, menuDescription) -- self is manager (Menu.GetManager)
 end
 
 function S:Blizzard_Menu()
 	if not (E.private.skins.blizzard.enable and E.private.skins.blizzard.misc) then return end
 
 	local manager = _G.Menu.GetManager()
 	if manager then
-		hooksecurefunc(manager, 'OpenMenu', OpenMenu)
-		hooksecurefunc(manager, 'OpenContextMenu', OpenMenu)
+		hooksecurefunc(manager, 'OpenMenu', S.OpenMenu)
+		hooksecurefunc(manager, 'OpenContextMenu', S.OpenContextMenu)
 	end
 end
 

ElvUI/Classic/Modules/Skins/Menu.lua

@@ -20,23 +20,29 @@ local function SkinFrame(frame)
 	end
 end
 
-local function OpenMenu(manager, region, menuDescription)
+function S:SkinMenu(manager, ownerRegion, menuDescription, anchor)
 	local menu = manager:GetOpenMenu()
-	if menu then
-		-- Initial context menu
-		SkinFrame(menu)
-		-- SubMenus
-		menuDescription:AddMenuAcquiredCallback(SkinFrame)
-	end
+	if not menu then return end
+
+	SkinFrame(menu) -- Initial context menu
+	menuDescription:AddMenuAcquiredCallback(SkinFrame) -- SubMenus
+end
+
+function S:OpenMenu(ownerRegion, menuDescription, anchor)
+	S:SkinMenu(self, ownerRegion, menuDescription, anchor) -- self is manager (Menu.GetManager)
+end
+
+function S:OpenContextMenu(ownerRegion, menuDescription)
+	S:SkinMenu(self, ownerRegion, menuDescription) -- self is manager (Menu.GetManager)
 end
 
 function S:Blizzard_Menu()
 	if not (E.private.skins.blizzard.enable and E.private.skins.blizzard.misc) then return end
 
 	local manager = _G.Menu.GetManager()
 	if manager then
-		hooksecurefunc(manager, 'OpenMenu', OpenMenu)
-		hooksecurefunc(manager, 'OpenContextMenu', OpenMenu)
+		hooksecurefunc(manager, 'OpenMenu', S.OpenMenu)
+		hooksecurefunc(manager, 'OpenContextMenu', S.OpenContextMenu)
 	end
 end
 

ElvUI/Core/Modules/Nameplates/Elements/CastBar.lua

@@ -133,7 +133,7 @@ function NP:Construct_Castbar(nameplate)
 	local castbar = CreateFrame('StatusBar', '$parentCastbar', nameplate)
 	castbar:SetFrameStrata(nameplate:GetFrameStrata())
 	castbar:SetFrameLevel(5)
-	castbar:CreateBackdrop('Transparent', nil, nil, nil, nil, true, true)
+	castbar:CreateBackdrop('Transparent', nil, nil, nil, nil, true)
 	castbar:SetStatusBarTexture(LSM:Fetch('statusbar', NP.db.statusbar))
 
 	NP.StatusBars[castbar] = true

ElvUI/Core/Modules/Nameplates/Elements/ClassPower.lua

@@ -77,7 +77,7 @@ end
 function NP:Construct_ClassPower(nameplate)
 	local containerName = nameplate.frameName..'ClassPower'
 	local ClassPower = CreateFrame('Frame', containerName, nameplate)
-	ClassPower:CreateBackdrop('Transparent', nil, nil, nil, nil, true, true)
+	ClassPower:CreateBackdrop('Transparent', nil, nil, nil, nil, true)
 	ClassPower:Hide()
 	ClassPower:SetFrameStrata(nameplate:GetFrameStrata())
 	ClassPower:SetFrameLevel(5)
@@ -214,7 +214,7 @@ function NP:Construct_Runes(nameplate)
 	local Runes = CreateFrame('Frame', containerName, nameplate)
 	Runes:SetFrameStrata(nameplate:GetFrameStrata())
 	Runes:SetFrameLevel(5)
-	Runes:CreateBackdrop('Transparent', nil, nil, nil, nil, true, true)
+	Runes:CreateBackdrop('Transparent', nil, nil, nil, nil, true)
 	Runes:Hide()
 
 	Runes.PostUpdate = NP.Runes_PostUpdate
@@ -295,7 +295,7 @@ function NP:Construct_Stagger(nameplate)
 	Stagger:SetFrameStrata(nameplate:GetFrameStrata())
 	Stagger:SetFrameLevel(5)
 	Stagger:SetStatusBarTexture(LSM:Fetch('statusbar', NP.db.statusbar))
-	Stagger:CreateBackdrop('Transparent', nil, nil, nil, nil, true, true)
+	Stagger:CreateBackdrop('Transparent', nil, nil, nil, nil, true)
 	Stagger:Hide()
 
 	NP.StatusBars[Stagger] = true

ElvUI/Core/Modules/Nameplates/Elements/Health.lua

@@ -64,7 +64,7 @@ function NP:Construct_Health(nameplate)
 	local Health = CreateFrame('StatusBar', nameplate.frameName..'Health', nameplate)
 	Health:SetFrameStrata(nameplate:GetFrameStrata())
 	Health:SetFrameLevel(5)
-	Health:CreateBackdrop('Transparent', nil, nil, nil, nil, true, true)
+	Health:CreateBackdrop('Transparent', nil, nil, nil, nil, true)
 	Health:SetStatusBarTexture(LSM:Fetch('statusbar', NP.db.statusbar))
 	Health.considerSelectionInCombatHostile = true
 	Health.UpdateColor = NP.Health_UpdateColor

ElvUI/Core/Modules/Nameplates/Elements/Power.lua

@@ -102,7 +102,7 @@ function NP:Construct_Power(nameplate)
 	local Power = CreateFrame('StatusBar', nameplate.frameName..'Power', nameplate)
 	Power:SetFrameStrata(nameplate:GetFrameStrata())
 	Power:SetFrameLevel(5)
-	Power:CreateBackdrop('Transparent', nil, nil, nil, nil, true, true)
+	Power:CreateBackdrop('Transparent', nil, nil, nil, nil, true)
 
 	NP.StatusBars[Power] = true
 

ElvUI/Mainline/Modules/Skins/Menu.lua

@@ -20,23 +20,29 @@ local function SkinFrame(frame)
 	end
 end
 
-local function OpenMenu(manager, region, menuDescription)
+function S:SkinMenu(manager, ownerRegion, menuDescription, anchor)
 	local menu = manager:GetOpenMenu()
-	if menu then
-		-- Initial context menu
-		SkinFrame(menu)
-		-- SubMenus
-		menuDescription:AddMenuAcquiredCallback(SkinFrame)
-	end
+	if not menu then return end
+
+	SkinFrame(menu) -- Initial context menu
+	menuDescription:AddMenuAcquiredCallback(SkinFrame) -- SubMenus
+end
+
+function S:OpenMenu(ownerRegion, menuDescription, anchor)
+	S:SkinMenu(self, ownerRegion, menuDescription, anchor) -- self is manager (Menu.GetManager)
+end
+
+function S:OpenContextMenu(ownerRegion, menuDescription)
+	S:SkinMenu(self, ownerRegion, menuDescription) -- self is manager (Menu.GetManager)
 end
 
 function S:Blizzard_Menu()
 	if not (E.private.skins.blizzard.enable and E.private.skins.blizzard.misc) then return end
 
 	local manager = _G.Menu.GetManager()
 	if manager then
-		hooksecurefunc(manager, 'OpenMenu', OpenMenu)
-		hooksecurefunc(manager, 'OpenContextMenu', OpenMenu)
+		hooksecurefunc(manager, 'OpenMenu', S.OpenMenu)
+		hooksecurefunc(manager, 'OpenContextMenu', S.OpenContextMenu)
 	end
 end