From c094e2930ce737c4166a6f54d57d7fa1731b2a74 Mon Sep 17 00:00:00 2001
From: Parnic <parnic@parnic.com>
Date: Wed, 26 Nov 2008 16:38:46 +0000
Subject: [PATCH] - fixed TargetTargetMana bar to be able to use its own colors
 instead of inheriting what TargetMana was set to

---
 modules/TargetMana.lua         | 35 +++++++++++++++++++---------------
 modules/TargetOfTargetMana.lua | 26 +++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 15 deletions(-)

diff --git a/modules/TargetMana.lua b/modules/TargetMana.lua
index c5e32a9..157f0a6 100644
--- a/modules/TargetMana.lua
+++ b/modules/TargetMana.lua
@@ -2,6 +2,8 @@ local AceOO = AceLibrary("AceOO-2.0")
 
 IceTargetMana = AceOO.Class(IceUnitBar)
 IceTargetMana.prototype.registerEvents = true
+IceTargetHealth.prototype.color = nil
+IceTargetMana.prototype.determineColor = true
 
 
 -- Constructor --
@@ -80,24 +82,27 @@ function IceTargetMana.prototype:Update(unit)
 		return
 	end
 
+	if self.determineColor then
+		self.color = "TargetMana"
 
-	local color = "TargetMana"
-	if (self.moduleSettings.scaleManaColor) then
-		color = "ScaledManaColor"
-	end
-	if (manaType == 1) then
-		color = "TargetRage"
-	elseif (manaType == 2) then
-		color = "TargetFocus"
-	elseif (manaType == 3) then
-		color = "TargetEnergy"
+		if (self.moduleSettings.scaleManaColor) then
+			self.color = "ScaledManaColor"
+		end
+
+		if (manaType == 1) then
+			self.color = "TargetRage"
+		elseif (manaType == 2) then
+			self.color = "TargetFocus"
+		elseif (manaType == 3) then
+			self.color = "TargetEnergy"
+		end
+
+		if (self.tapped) then
+			self.color = "Tapped"
+		end
 	end
 	
-	if (self.tapped) then
-		color = "Tapped"
-	end
-	
-	self:UpdateBar(self.manaPercentage, color)
+	self:UpdateBar(self.manaPercentage, self.color)
 
 	if not IceHUD.IceCore:ShouldUseDogTags() then
 		self:SetBottomText1(math.floor(self.manaPercentage * 100))
diff --git a/modules/TargetOfTargetMana.lua b/modules/TargetOfTargetMana.lua
index bdb6725..beaf463 100644
--- a/modules/TargetOfTargetMana.lua
+++ b/modules/TargetOfTargetMana.lua
@@ -28,6 +28,8 @@ end
 
 function TargetTargetMana.prototype:Enable(core)
 	self.registerEvents = false
+	-- make sure the super class doesn't override our color selection
+	self.determineColor = false
 	TargetTargetMana.super.prototype.Enable(self, core)
 
 	self:ScheduleRepeatingEvent(self.elementName, self.Update, 0.1, self, "targettarget")
@@ -39,5 +41,29 @@ function TargetTargetMana.prototype:Disable(core)
 	self:CancelScheduledEvent(self.elementName)
 end
 
+function TargetTargetMana.prototype:Update(unit)
+	self.color = "TargetTargetMana"
+
+	local manaType = UnitPowerType(self.unit)
+
+	if (self.moduleSettings.scaleManaColor) then
+		self.color = "ScaledManaColor"
+	end
+
+	if (manaType == 1) then
+		self.color = "TargetTargetRage"
+	elseif (manaType == 2) then
+		self.color = "TargetTargetFocus"
+	elseif (manaType == 3) then
+		self.color = "TargetTargetEnergy"
+	end
+
+	if (self.tapped) then
+		self.color = "Tapped"
+	end
+
+	TargetTargetMana.super.prototype.Update(self, unit)
+end
+
 -- Load us up
 IceHUD.TargetTargetMana = TargetTargetMana:new()