Cooldowns: Don't do a full bar style refresh on player status changes

BigWigsMods · Oct 13, 2016 · c72912f · c72912f
1 parent 2ea15f0
commit c72912f
Showing 1 changed file with 57 additions and 47 deletions.
diff --git a/modules/Cooldowns/Displays/Bars.lua b/modules/Cooldowns/Displays/Bars.lua
@@ -192,49 +192,27 @@ do
 		return self[key]
 	end })
 
-	function prototype:RestyleBar(bar)
+	function prototype:UpdateBarStatus(bar)
 		local db = self.db
-
-		local barStyle = bar:Get("ora3cd:barstyle")
-		if barStyle and barStyle ~= db.barStyle then
-			barStyles[barStyle].BarStopped(bar)
-			bar.candyBarBackdrop:Hide()
-		end
-		barStyle = db.barStyle
-		bar:Set("ora3cd:barstyle", barStyle)
-
 		local player = bar:Get("ora3cd:player")
 		local status = UnitExists(player) and (not UnitIsConnected(player) and L.offline or UnitIsDeadOrGhost(player) and L.dead or (IsInGroup() and not UnitInRange(player)) and L.range)
-		local classColor = classColors[bar:Get("ora3cd:class")] or classColors.UNKNOWN
 		local spell = bar:Get("ora3cd:spell")
+		if db.barShorthand then spell = shorts[spell] end
 
-		bar:SetScale(db.barScale)
-		bar:SetHeight(db.barHeight)
-		bar:SetIcon(db.barShowIcon and bar:Get("ora3cd:icon"))
-		bar:SetTexture(media:Fetch("statusbar", db.barTexture))
-		bar.fill = db.barFill and not bar:Get("ora3cd:ready") -- set directly, don't update min/max values
+		-- update color
 		if status and db.barColorStatus then
 			local r, g, b, a = unpack(db.barStatusColor)
 			bar:SetColor(r, g, b, a or 1)
 		elseif db.barClassColor then
+			local classColor = classColors[bar:Get("ora3cd:class")] or classColors.UNKNOWN
 			bar:SetColor(classColor.r, classColor.g, classColor.b, 1)
 		else
 			local r, g, b, a = unpack(db.barColor)
 			bar:SetColor(r, g, b, a or 1)
 		end
-		bar.candyBarBackground:SetVertexColor(unpack(db.barColorBG))
-
-		bar.candyBarLabel:SetFont(media:Fetch("font", db.barLabelFont), db.barLabelFontSize, db.barLabelOutline ~= "NONE" and db.barLabelOutline)
-		bar.candyBarLabel:SetJustifyH(db.barLabelAlign)
-		if db.barLabelClassColor then
-			bar.candyBarLabel:SetTextColor(classColor.r, classColor.g, classColor.b, 1)
-		else
-			bar.candyBarLabel:SetTextColor(unpack(db.barLabelColor))
-		end
 
+		-- update label
 		local unit = player:gsub("%-.+", "")
-		if db.barShorthand then spell = shorts[spell] end
-
 		local charges = bar:Get("ora3cd:charges")
 		if tonumber(charges) and charges > 0 then
 			if db.barShowSpell then
@@ -259,28 +237,60 @@ do
 		else
 			bar:SetLabel()
 		end
+	end
+end
 
-		bar.candyBarDuration:SetFont(media:Fetch("font", db.barDurationFont), db.barDurationFontSize, db.barDurationOutline ~= "NONE" and db.barDurationOutline)
-		if db.barDurationClassColor then
-			bar.candyBarDuration:SetTextColor(classColor.r, classColor.g, classColor.b, 1)
-		else
-			bar.candyBarDuration:SetTextColor(unpack(db.barDurationColor))
-		end
-		bar:SetTimeVisibility(db.barShowDuration and not bar:Get("ora3cd:ready")) -- show cd text for charges?
-
-		if barStyle == "Default" then
-			bar.candyBarDuration:ClearAllPoints()
-			if db.barDurationAlign == "RIGHT" then
-				bar.candyBarDuration:SetPoint("RIGHT", bar.candyBarBar, "RIGHT", -2, 0)
-			elseif db.barDurationAlign == "LEFT" then
-				bar.candyBarDuration:SetPoint("LEFT", bar.candyBarBar, "LEFT", 2, 0)
-			elseif db.barDurationAlign == "CENTER" then
-				bar.candyBarDuration:SetPoint("CENTER", bar.candyBarBar, "CENTER", 0, 0)
-			end
-		end
+function prototype:RestyleBar(bar)
+	local db = self.db
+
+	local barStyle = bar:Get("ora3cd:barstyle")
+	if barStyle and barStyle ~= db.barStyle then
+		barStyles[barStyle].BarStopped(bar)
+		bar.candyBarBackdrop:Hide()
+	end
+	barStyle = db.barStyle
+	bar:Set("ora3cd:barstyle", barStyle)
+
+	local classColor = classColors[bar:Get("ora3cd:class")] or classColors.UNKNOWN
+
+	bar:SetScale(db.barScale)
+	bar:SetHeight(db.barHeight)
+	bar:SetIcon(db.barShowIcon and bar:Get("ora3cd:icon"))
+	bar:SetTexture(media:Fetch("statusbar", db.barTexture))
+	bar.fill = db.barFill and not bar:Get("ora3cd:ready") -- set directly, don't update min/max values
+
+	bar.candyBarBackground:SetVertexColor(unpack(db.barColorBG))
 
-		barStyles[barStyle].ApplyStyle(bar)
+	bar.candyBarLabel:SetFont(media:Fetch("font", db.barLabelFont), db.barLabelFontSize, db.barLabelOutline ~= "NONE" and db.barLabelOutline)
+	bar.candyBarLabel:SetJustifyH(db.barLabelAlign)
+	if db.barLabelClassColor then
+		bar.candyBarLabel:SetTextColor(classColor.r, classColor.g, classColor.b, 1)
+	else
+		bar.candyBarLabel:SetTextColor(unpack(db.barLabelColor))
 	end
+
+	bar.candyBarDuration:SetFont(media:Fetch("font", db.barDurationFont), db.barDurationFontSize, db.barDurationOutline ~= "NONE" and db.barDurationOutline)
+	if db.barDurationClassColor then
+		bar.candyBarDuration:SetTextColor(classColor.r, classColor.g, classColor.b, 1)
+	else
+		bar.candyBarDuration:SetTextColor(unpack(db.barDurationColor))
+	end
+	bar:SetTimeVisibility(db.barShowDuration and not bar:Get("ora3cd:ready")) -- show cd text for charges?
+
+	if barStyle == "Default" then
+		bar.candyBarDuration:ClearAllPoints()
+		if db.barDurationAlign == "RIGHT" then
+			bar.candyBarDuration:SetPoint("RIGHT", bar.candyBarBar, "RIGHT", -2, 0)
+		elseif db.barDurationAlign == "LEFT" then
+			bar.candyBarDuration:SetPoint("LEFT", bar.candyBarBar, "LEFT", 2, 0)
+		elseif db.barDurationAlign == "CENTER" then
+			bar.candyBarDuration:SetPoint("CENTER", bar.candyBarBar, "CENTER", 0, 0)
+		end
+	end
+
+	self:UpdateBarStatus(bar)
+
+	barStyles[barStyle].ApplyStyle(bar)
 end
 
 function prototype:GetBar(guid, spellId)
@@ -421,7 +431,7 @@ function prototype:oRA3CD_UpdatePlayer(_, guid)
 	for bar in next, self.bars do
 		if bar:Get("ora3cd:guid") == guid then
 			if oRA3CD:CheckFilter(self, bar:Get("ora3cd:player")) then
-				self:RestyleBar(bar)
+				self:UpdateBarStatus(bar)
 			else
 				bar:Stop()
 			end