fix pvp widget bar, part 1

Author: kodewdle

ElvUI/Core/Modules/Blizzard/WidgetsUI.lua

@@ -3,6 +3,7 @@ local BL = E:GetModule('Blizzard')
 local NP = E:GetModule('NamePlates')
 
 local _G = _G
+local next = next
 local pairs = pairs
 local strmatch = strmatch
 local CreateFrame = CreateFrame
@@ -23,6 +24,14 @@ function BL:UIWidgetTemplateStatusBar()
 		return -- we don't want to handle these widgets
 	end
 
+	bar.BGLeft:SetAlpha(0)
+	bar.BGRight:SetAlpha(0)
+	bar.BGCenter:SetAlpha(0)
+	bar.BorderLeft:SetAlpha(0)
+	bar.BorderRight:SetAlpha(0)
+	bar.BorderCenter:SetAlpha(0)
+	bar.Spark:SetAlpha(0)
+
 	if not bar.backdrop then
 		bar:CreateBackdrop('Transparent')
 
@@ -38,55 +47,76 @@ function BL:UIWidgetTemplateStatusBar()
 		if bar.Label then -- percent text
 			bar.Label:FontTemplate(nil, nil, 'SHADOW')
 		end
-
-		bar.BGLeft:SetAlpha(0)
-		bar.BGRight:SetAlpha(0)
-		bar.BGCenter:SetAlpha(0)
-		bar.BorderLeft:SetAlpha(0)
-		bar.BorderRight:SetAlpha(0)
-		bar.BorderCenter:SetAlpha(0)
-		bar.Spark:SetAlpha(0)
 	end
 end
 
-local function PVPCaptureBar(self)
+function BL:CaptureBar_PVP()
 	self.LeftLine:SetAlpha(0)
 	self.RightLine:SetAlpha(0)
 	self.BarBackground:SetAlpha(0)
+	self.SparkNeutral:SetAlpha(0)
+
 	self.Glow1:SetAlpha(0)
 	self.Glow2:SetAlpha(0)
 	self.Glow3:SetAlpha(0)
-
-	self.LeftBar:SetTexture(E.media.normTex)
-	self.RightBar:SetTexture(E.media.normTex)
-	self.NeutralBar:SetTexture(E.media.normTex)
+	self.GlowPulseAnim:Stop()
 
 	self.LeftBar:SetVertexColor(0.2, 0.6, 1.0)
 	self.RightBar:SetVertexColor(0.9, 0.2, 0.2)
 	self.NeutralBar:SetVertexColor(0.8, 0.8, 0.8)
 
-	if not self.backdrop then
-		local x = E.PixelMode and 1 or 2
+	self.LeftBar:SetTexture(E.media.normTex)
+	self.RightBar:SetTexture(E.media.normTex)
+	self.NeutralBar:SetTexture(E.media.normTex)
 
+	if not self.backdrop then
 		self:CreateBackdrop()
+
+		local x = E.PixelMode and 1 or 2
 		self.backdrop:Point('TOPLEFT', self.LeftBar, -x, x)
 		self.backdrop:Point('BOTTOMRIGHT', self.RightBar, x, -x)
+	else
+		self.backdrop:SetFrameLevel(self:GetFrameLevel() - 1)
 	end
 end
 
-local function EmberCourtCaptureBar() end
+function BL:CaptureBar_EmberCourt() end
+
 local captureBarSkins = {
-	[2] = PVPCaptureBar,
-	[252] = EmberCourtCaptureBar
+	[2] = BL.CaptureBar_PVP,
+	[252] = BL.CaptureBar_EmberCourt
 }
 
-function BL:UIWidgetTemplateCaptureBar(_, widget)
-	if self:IsForbidden() or not widget then return end
+function BL:WidgetCaptureBar_Update(_, container)
+	if self:IsForbidden() or not container then return end
 
-	local skinFunc = captureBarSkins[widget.widgetSetID]
+	local skinFunc = captureBarSkins[container.widgetSetID]
 	if skinFunc then skinFunc(self) end
 end
 
+function BL:WidgetCaptureBar_ProcessWidget(widgetID, widgetType)
+	if not self or not self.widgetFrames then return end
+
+	if widgetID then
+		local bar = self.widgetFrames[widgetID]
+		if bar then
+			BL.WidgetCaptureBar_Update(bar, nil, self)
+		end
+	else
+		for _, bar in next, self.widgetFrames do
+			BL.WidgetCaptureBar_Update(bar, nil, self)
+		end
+	end
+end
+
+function BL:WidgetCaptureBar_ApplyEffectToFrame(widgetInfo, widgetContainer, frame)
+	BL.WidgetCaptureBar_Update(self, widgetInfo, widgetContainer, frame)
+end
+
+function BL:WidgetCaptureBar_Setup(widgetInfo, widgetContainer)
+	BL.WidgetCaptureBar_Update(self, widgetInfo, widgetContainer)
+end
+
 local function UpdatePosition(frame, _, anchor)
 	local holder = frame.containerHolder
 	if holder and anchor ~= holder then
@@ -116,7 +146,6 @@ end
 function BL:HandleWidgets()
 	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(nil, 'GMMover', 'TOP', L["GM Ticket Frame"], _G.TicketStatusFrame, 'TOPLEFT', E.UIParent, 'TOPLEFT', 250, -5, nil, nil, 'ALL,GENERAL')
 
 	if E.Retail then
@@ -131,13 +160,18 @@ function BL:HandleWidgets()
 	end
 
 	if not E.Retail then
-		_G.DurabilityFrame:SetFrameStrata('HIGH')
 		local duraWidth, duraHeight = _G.DurabilityFrame:GetSize()
+		_G.DurabilityFrame:SetFrameStrata('HIGH')
+
 		BL:BuildWidgetHolder('DurabilityFrameHolder', 'DurabilityFrameMover', 'CENTER', L["Durability Frame"], _G.DurabilityFrame, 'TOPRIGHT', E.UIParent, 'TOPRIGHT', -135, -300, duraWidth, duraHeight, 'ALL,GENERAL')
 		BL:UpdateDurabilityScale()
 	end
 
 	-- Credits ShestakUI
 	hooksecurefunc(_G.UIWidgetTemplateStatusBarMixin, 'Setup', BL.UIWidgetTemplateStatusBar)
-	hooksecurefunc(_G.UIWidgetTemplateCaptureBarMixin, 'Setup', BL.UIWidgetTemplateCaptureBar)
+
+	--hooksecurefunc(_G.UIWidgetTemplateCaptureBarMixin, 'Setup', BL.WidgetCaptureBar_Setup)
+	--hooksecurefunc(_G.UIWidgetTemplateCaptureBarMixin, 'ApplyEffectToFrame', BL.WidgetCaptureBar_ApplyEffectToFrame)
+	hooksecurefunc(_G.UIWidgetBelowMinimapContainerFrame, 'ProcessWidget', BL.WidgetCaptureBar_ProcessWidget)
+	BL.WidgetCaptureBar_ProcessWidget(_G.UIWidgetBelowMinimapContainerFrame) -- finds any pre-existing capture bars
 end