Try to fix Extra action button flickering, again

Author: brittyazel

Neuron.toc

@@ -53,4 +53,4 @@ XML\NeuronStatusBarTemplate.xml
 Neuron-Startup.lua
 
 Neuron-GUI.lua
-XML\Neuron-GUI.xml
+XML\Neuron-GUI.xml

Objects/BUTTON.lua

@@ -148,11 +148,7 @@ function BUTTON:CancelCooldownTimer(stopAnimation)
 	end
 	self.iconframecooldown.timer:SetText("")
 
-	if self.data.alpha then
-		self:SetAlpha(self.data.alpha) --try to restore the original alpha
-	else
-		self:SetAlpha(1)
-	end
+	self:SetObjectVisibility()
 
 	self.iconframecooldown.showCountdownTimer = false
 	self.iconframecooldown.showCountdownAlpha = false
@@ -167,7 +163,10 @@ end
 function BUTTON:SetCooldownTimer(start, duration, enable, showCountdownTimer, modrate, color1, color2, showCountdownAlpha, charges, maxCharges)
 
 	if not self.isShown then --if the button isn't shown, don't do set any cooldowns
-		self:CancelCooldownTimer(true)
+		--if there's currently a timer, cancel it
+		if self:TimeLeft(self.iconframecooldown.cooldownTimer) ~= 0 then
+			self:CancelCooldownTimer(true)
+		end
 		return
 	end
 
@@ -500,6 +499,7 @@ function BUTTON:SetObjectVisibility()
 		else
 			self:SetAlpha(0)
 		end
+
 	else
 
 		if InCombatLockdown() then

Objects/EXITBTN.lua

@@ -66,7 +66,7 @@ end
 
 
 function EXITBTN:OnEvent(event, ...)
-	self:SetButtonTex()
+	self:UpdateIcon()
 	self:SetObjectVisibility()
 end
 
@@ -83,7 +83,8 @@ function EXITBTN:SetObjectVisibility(show)
 
 end
 
-function EXITBTN:SetButtonTex()
+---overwrite function in parent class BUTTON
+function EXITBTN:UpdateIcon()
 
 	self.iconframeicon:SetTexture("Interface\\AddOns\\Neuron\\Images\\new_vehicle_exit")
 

Objects/EXTRABTN.lua

@@ -57,9 +57,9 @@ function EXTRABTN:SetType()
 	self:RegisterEvent("ZONE_CHANGED", "OnEvent")
 	self:RegisterEvent("SPELLS_CHANGED", "OnEvent")
 	self:RegisterEvent("PLAYER_ENTERING_WORLD", "OnEvent")
-	self:RegisterEvent("SPELL_UPDATE_COOLDOWN", "OnEvent")
-	self:RegisterEvent("SPELL_UPDATE_CHARGES", "OnEvent")
-	self:RegisterEvent("SPELL_UPDATE_USABLE", "OnEvent")
+	--self:RegisterEvent("SPELL_UPDATE_COOLDOWN", "OnEvent")
+	--self:RegisterEvent("SPELL_UPDATE_CHARGES", "OnEvent")
+	--self:RegisterEvent("SPELL_UPDATE_USABLE", "OnEvent")
 
 	self:SetAttribute("type1", "action")
 
@@ -70,16 +70,13 @@ function EXTRABTN:SetType()
 	self:SetScript("OnEnter", function(self, ...) self:OnEnter(...) end)
 	self:SetScript("OnLeave", GameTooltip_Hide)
 
-
-
 	self:SetSkinned()
 end
 
 
 function EXTRABTN:OnEvent(event, ...)
 
 	self:UpdateButton()
-	self:SetObjectVisibility()
 
 	if event == "PLAYER_ENTERING_WORLD" then
 		self.binder:ApplyBindings()
@@ -107,6 +104,8 @@ function EXTRABTN:UpdateButton()
 	_, self.spellID = GetActionInfo(self.actionID)
 	self.spellName, _, self.spellIcon = GetSpellInfo(self.spellID);
 
+	self:SetObjectVisibility()
+
 	if self.spellID then
 		self:UpdateIcon()
 
@@ -137,11 +136,6 @@ end
 
 ---overwrite function in parent class BUTTON
 function EXTRABTN:UpdateIcon()
-	self:SetButtonTex()
-end
-
-
-function EXTRABTN:SetButtonTex()
 
 	self.iconframeicon:SetTexture(self.spellIcon)
 
@@ -153,6 +147,7 @@ function EXTRABTN:SetButtonTex()
 	else
 		self.style:Hide()
 	end
+
 end
 
 

Objects/ZONEABILITYBTN.lua

@@ -79,7 +79,6 @@ end
 function ZONEABILITYBTN:OnEvent(event, ...)
 
 	self:UpdateButton();
-	self:SetObjectVisibility()
 
 	if event == "PLAYER_ENTERING_WORLD" then
 		self.binder:ApplyBindings()
@@ -93,6 +92,8 @@ function ZONEABILITYBTN:UpdateButton()
 	self.spellID = GetZoneAbilitySpellInfo();
 	self.spellName, _, self.spellIcon = GetSpellInfo(self.spellID);
 
+	self:SetObjectVisibility()
+
 	if self.spellID then
 		self:UpdateIcon()
 
@@ -127,10 +128,6 @@ end
 
 ---overwrite function in parent class BUTTON
 function ZONEABILITYBTN:UpdateIcon()
-	self:SetButtonTex()
-end
-
-function ZONEABILITYBTN:SetButtonTex()
 
 	self.iconframeicon:SetTexture(self.spellIcon);
 
@@ -142,8 +139,10 @@ function ZONEABILITYBTN:SetButtonTex()
 	else
 		self.style:Hide()
 	end
+
 end
 
+
 function ZONEABILITYBTN:OnEnter(...)
 
 	if (self.bar) then