Merge branch 'main' into ptr

Author: Merathilis

ElvUI/Core/Modules/Blizzard/WidgetsUI.lua

@@ -95,7 +95,9 @@ function BL:BelowMinimap_UpdateBar(_, container)
 end
 
 function BL:UIWidgetTemplateCaptureBar(widgetInfo, container)
-	if container == _G.UIWidgetBelowMinimapContainerFrame then return end -- handled by ProcessWidget
+	if container == _G.UIWidgetBelowMinimapContainerFrame and container.ProcessWidget then
+		return -- handled by ProcessWidget hook instead
+	end
 
 	BL.BelowMinimap_UpdateBar(self, widgetInfo, container)
 end
@@ -142,8 +144,9 @@ function BL:UpdateDurabilityScale()
 end
 
 function BL:HandleWidgets()
+	local BelowMinimapContainer = _G.UIWidgetBelowMinimapContainerFrame
 	BL:BuildWidgetHolder('TopCenterContainerHolder', 'TopCenterContainerMover', 'CENTER', L["TopCenterWidget"], _G.UIWidgetTopCenterContainerFrame, 'TOP', E.UIParent, 'TOP', 0, -30, 125, 20, 'ALL,WIDGETS')
-	BL:BuildWidgetHolder('BelowMinimapContainerHolder', 'BelowMinimapContainerMover', 'CENTER', L["BelowMinimapWidget"], _G.UIWidgetBelowMinimapContainerFrame, 'TOPRIGHT', _G.Minimap, 'BOTTOMRIGHT', 0, -16, 150, 30, 'ALL,WIDGETS')
+	BL:BuildWidgetHolder('BelowMinimapContainerHolder', 'BelowMinimapContainerMover', 'CENTER', L["BelowMinimapWidget"], BelowMinimapContainer, 'TOPRIGHT', _G.Minimap, 'BOTTOMRIGHT', 0, -16, 150, 30, 'ALL,WIDGETS')
 	BL:BuildWidgetHolder(nil, 'GMMover', 'TOP', L["GM Ticket Frame"], _G.TicketStatusFrame, 'TOPLEFT', E.UIParent, 'TOPLEFT', 250, -5, nil, nil, 'ALL,GENERAL')
 
 	if E.Retail then
@@ -155,9 +158,7 @@ function BL:HandleWidgets()
 		for _, widget in pairs(_G.UIWidgetPowerBarContainerFrame.widgetFrames) do
 			BL.UIWidgetTemplateStatusBar(widget)
 		end
-	end
-
-	if not E.Retail then
+	else
 		local duraWidth, duraHeight = _G.DurabilityFrame:GetSize()
 		_G.DurabilityFrame:SetFrameStrata('HIGH')
 
@@ -170,6 +171,9 @@ function BL:HandleWidgets()
 	hooksecurefunc(_G.UIWidgetTemplateCaptureBarMixin, 'Setup', BL.UIWidgetTemplateCaptureBar)
 
 	-- Below Minimap Widgets
-	hooksecurefunc(_G.UIWidgetBelowMinimapContainerFrame, 'ProcessWidget', BL.BelowMinimap_ProcessWidget)
-	BL.BelowMinimap_ProcessWidget(_G.UIWidgetBelowMinimapContainerFrame) -- finds any pre-existing capture bars
+	if BelowMinimapContainer.ProcessWidget then
+		hooksecurefunc(BelowMinimapContainer, 'ProcessWidget', BL.BelowMinimap_ProcessWidget)
+	end
+
+	BL.BelowMinimap_ProcessWidget(BelowMinimapContainer) -- finds any pre-existing capture bars
 end

ElvUI_Options/Core/ActionBars.lua

@@ -305,7 +305,7 @@ ActionBar.args.masqueGroup = ACH:Group(L["Masque"], nil, -1, nil, nil, nil, func
 ActionBar.args.masqueGroup.args.masque = ACH:MultiSelect(L["Masque Support"], L["Allow Masque to handle the skinning of this element."], 10, { actionbars = L["ActionBars"], petBar = L["Pet Bar"], stanceBar = L["Stance Bar"] }, nil, nil, function(_, key) return E.private.actionbar.masque[key] end, function(_, key, value) E.private.actionbar.masque[key] = value E.ShowPopup = true end)
 
 ActionBar.args.extraButtons = ACH:Group(L["Extra Buttons"], nil, 18, nil, nil, nil, function() return not E.ActionBars.Initialized end)
-ActionBar.args.extraButtons.args.extraActionButton = ACH:Group(L["Boss Button"], nil, 1, nil, function(info) return E.db.actionbar.extraActionButton[info[#info]] end, function(info, value) local key = info[#info] E.db.actionbar.extraActionButton[key] = value if key == 'inheritGlobalFade' then AB:ExtraButtons_GlobalFade() elseif key == 'scale' then AB:ExtraButtons_UpdateScale() else AB:ExtraButtons_UpdateAlpha() end end, nil, not E.Retail)
+ActionBar.args.extraButtons.args.extraActionButton = ACH:Group(L["Boss Button"], nil, 1, nil, function(info) return E.db.actionbar.extraActionButton[info[#info]] end, function(info, value) local key = info[#info] E.db.actionbar.extraActionButton[key] = value if key == 'inheritGlobalFade' then AB:ExtraButtons_GlobalFade() elseif key == 'scale' then AB:ExtraButtons_UpdateScale() else AB:ExtraButtons_UpdateAlpha() end end, nil, E.Classic)
 ActionBar.args.extraButtons.args.extraActionButton.inline = true
 ActionBar.args.extraButtons.args.extraActionButton.args = CopyTable(SharedButtonOptions)