display power

tukui-org · Dec 1, 2024 · 739ceca · 739ceca
1 parent e228550
commit 739ceca
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 15 deletions.
diff --git a/ElvUI_Libraries/Core/oUF/elements/additionalpower.lua b/ElvUI_Libraries/Core/oUF/elements/additionalpower.lua
@@ -250,7 +250,7 @@ local function Enable(self, unit)
 		element.__owner = self
 		element.ForceUpdate = ForceUpdate
 
-		oUF:RegisterEvent(self, 'UNIT_DISPLAYPOWER', VisibilityPath)
+		self:RegisterEvent('UNIT_DISPLAYPOWER', VisibilityPath)
 
 		if(not element.displayPairs) then
 			element.displayPairs = CopyTable(ALT_POWER_INFO)
@@ -269,7 +269,7 @@ local function Disable(self)
 	if(element) then
 		ElementDisable(self)
 
-		oUF:UnregisterEvent(self, 'UNIT_DISPLAYPOWER', VisibilityPath)
+		self:UnregisterEvent('UNIT_DISPLAYPOWER', VisibilityPath)
 	end
 end
 

diff --git a/ElvUI_Libraries/Core/oUF/elements/classpower.lua b/ElvUI_Libraries/Core/oUF/elements/classpower.lua
@@ -330,12 +330,12 @@ local function Enable(self, unit)
 		element.__max = #element
 		element.ForceUpdate = ForceUpdate
 
-		if(oUF.isRetail or oUF.isCata) and (RequireSpec or RequireSpell) then
-			oUF:RegisterEvent(self, 'PLAYER_TALENT_UPDATE', VisibilityPath, true)
+		if(RequirePower) then
+			self:RegisterEvent('UNIT_DISPLAYPOWER', VisibilityPath)
 		end
 
-		if(RequirePower) then
-			oUF:RegisterEvent(self, 'UNIT_DISPLAYPOWER', VisibilityPath)
+		if(oUF.isRetail or oUF.isCata) and (RequireSpec or RequireSpell) then
+			oUF:RegisterEvent(self, 'PLAYER_TALENT_UPDATE', VisibilityPath, true)
 		end
 
 		element.ClassPowerEnable = ClassPowerEnable
@@ -360,12 +360,13 @@ local function Disable(self)
 	if(self.ClassPower) then
 		ClassPowerDisable(self)
 
+		oUF:UnregisterEvent(self, 'SPELLS_CHANGED', Visibility)
+
+		self:UnregisterEvent('UNIT_DISPLAYPOWER', VisibilityPath)
+
 		if oUF.isRetail or oUF.isCata then
 			oUF:UnregisterEvent(self, 'PLAYER_TALENT_UPDATE', VisibilityPath)
 		end
-
-		oUF:UnregisterEvent(self, 'UNIT_DISPLAYPOWER', VisibilityPath)
-		oUF:UnregisterEvent(self, 'SPELLS_CHANGED', Visibility)
 	end
 end
 

diff --git a/ElvUI_Libraries/Core/oUF/elements/power.lua b/ElvUI_Libraries/Core/oUF/elements/power.lua
@@ -376,10 +376,10 @@ local function Enable(self)
 			oUF:RegisterEvent(self, 'UNIT_THREAT_LIST_UPDATE', ColorPath)
 		end
 
-		oUF:RegisterEvent(self, 'UNIT_DISPLAYPOWER', Path)
 		oUF:RegisterEvent(self, 'UNIT_POWER_BAR_HIDE', Path)
 		oUF:RegisterEvent(self, 'UNIT_POWER_BAR_SHOW', Path)
 
+		self:RegisterEvent('UNIT_DISPLAYPOWER', Path)
 		self:RegisterEvent('UNIT_POWER_FREQUENT', Path)
 		self:RegisterEvent('UNIT_MAXPOWER', Path)
 
@@ -402,14 +402,14 @@ local function Disable(self)
 	if(element) then
 		element:Hide()
 
-		oUF:UnregisterEvent(self, 'UNIT_DISPLAYPOWER', Path)
 		oUF:UnregisterEvent(self, 'UNIT_POWER_BAR_HIDE', Path)
 		oUF:UnregisterEvent(self, 'UNIT_POWER_BAR_SHOW', Path)
 		oUF:UnregisterEvent(self, 'UNIT_CONNECTION', ColorPath)
 		oUF:UnregisterEvent(self, 'UNIT_FACTION', ColorPath)
 		oUF:UnregisterEvent(self, 'UNIT_FLAGS', ColorPath)
 		oUF:UnregisterEvent(self, 'UNIT_THREAT_LIST_UPDATE', ColorPath)
 
+		self:UnregisterEvent('UNIT_DISPLAYPOWER', Path)
 		self:UnregisterEvent('UNIT_POWER_FREQUENT', Path)
 		self:UnregisterEvent('UNIT_MAXPOWER', Path)
 	end

diff --git a/ElvUI_Libraries/Core/oUF/elements/powerprediction.lua b/ElvUI_Libraries/Core/oUF/elements/powerprediction.lua
@@ -216,7 +216,8 @@ local function Enable(self)
 		oUF:RegisterEvent(self, 'UNIT_SPELLCAST_STOP', Path)
 		oUF:RegisterEvent(self, 'UNIT_SPELLCAST_FAILED', Path)
 		oUF:RegisterEvent(self, 'UNIT_SPELLCAST_SUCCEEDED', Path)
-		oUF:RegisterEvent(self, 'UNIT_DISPLAYPOWER', Path)
+
+		self:RegisterEvent('UNIT_DISPLAYPOWER', Path)
 
 		if(element.mainBar) then
 			if(element.mainBar:IsObjectType('StatusBar') and not element.mainBar:GetStatusBarTexture()) then
@@ -249,7 +250,8 @@ local function Disable(self)
 		oUF:UnregisterEvent(self, 'UNIT_SPELLCAST_STOP', Path)
 		oUF:UnregisterEvent(self, 'UNIT_SPELLCAST_FAILED', Path)
 		oUF:UnregisterEvent(self, 'UNIT_SPELLCAST_SUCCEEDED', Path)
-		oUF:UnregisterEvent(self, 'UNIT_DISPLAYPOWER', Path)
+
+		self:UnregisterEvent('UNIT_DISPLAYPOWER', Path)
 	end
 end
 

diff --git a/ElvUI_Libraries/Core/oUF/elements/stagger.lua b/ElvUI_Libraries/Core/oUF/elements/stagger.lua
@@ -208,9 +208,10 @@ local function Enable(self, unit)
 		element.__owner = self
 		element.ForceUpdate = ForceUpdate
 
-		oUF:RegisterEvent(self, 'UNIT_DISPLAYPOWER', VisibilityPath)
 		oUF:RegisterEvent(self, 'PLAYER_TALENT_UPDATE', VisibilityPath, true)
 
+		self:RegisterEvent('UNIT_DISPLAYPOWER', VisibilityPath)
+
 		if(element:IsObjectType('StatusBar') and not element:GetStatusBarTexture()) then
 			element:SetStatusBarTexture([[Interface\TargetingFrame\UI-StatusBar]])
 		end
@@ -228,8 +229,9 @@ local function Disable(self)
 		element:Hide()
 
 		oUF:UnregisterEvent(self, 'UNIT_AURA', Path)
-		oUF:UnregisterEvent(self, 'UNIT_DISPLAYPOWER', VisibilityPath)
 		oUF:UnregisterEvent(self, 'PLAYER_TALENT_UPDATE', VisibilityPath)
+
+		self:UnregisterEvent('UNIT_DISPLAYPOWER', VisibilityPath)
 	end
 end