Added a class indicator, shows class icons for players, enabled on all units except player and pets

Added a global font color/alpha setting (Advanced only)
Fixed range check issues being stuck on a resurrect spell
Fixed a state bug causing display issues if something changes while the world map or the entire interface is hidden
Fixed a separated raid frame bug if you were in a group that had players skipping groups (group 1 and group 3, but not group 2, etc) and the column growth was left or right

Author: Shadowed

ShadowedUnitFrames.lua

@@ -88,6 +88,20 @@ function ShadowUF:OnInitialize()
 end
 
 function ShadowUF:CheckUpgrade()
+	-- June 19th
+	if( not ShadowUF.db.profile.font.color ) then
+		ShadowUF.db.profile.font.color = {r = 1, g = 1, b = 1, a = 1}
+		for unit, config in pairs(self.db.profile.units) do
+			local indicators = ShadowUF.db.profile.units[unit].indicators
+			if( indicators and indicators.class ) then
+				indicators.class.anchorTo = "$parent"
+				indicators.class.anchorPoint = "BL"
+				indicators.class.x = 0
+				indicators.class.y = 0
+			end
+		end
+	end
+	
 	-- April 29th
 	if( self.db.profile.filters.zones ) then
 		for unit, filter in pairs(self.db.profile.filters.zones) do
@@ -206,6 +220,10 @@ function ShadowUF:LoadUnitDefaults()
 
 		if( unit ~= "player" ) then
 			self.defaults.profile.units[unit].range = {enabled = false, oorAlpha = 0.80, inAlpha = 1.0}
+
+			if( not string.match(unit, "pet") ) then
+				self.defaults.profile.units[unit].indicators.class = {enabled = false, size = 19}
+			end
 		end
 
 		-- Want pvp/leader/ML enabled for these units

modules/defaultlayout.lua

@@ -94,7 +94,8 @@ function ShadowUF:LoadDefaultLayout(useMerge)
 		name = "Myriad Condensed Web",
 		size = 11,
 		extra = "",
-		shadowColor = {r = 0, g = 0, b = 0, a = 1.0},
+		shadowColor = {r = 0, g = 0, b = 0, a = 1},
+		color = {r = 1, g = 1, b = 1, a = 1},
 		shadowX = 0.80,
 		shadowY = -0.80,
 	}
@@ -198,6 +199,7 @@ function ShadowUF:LoadDefaultLayout(useMerge)
 		},
 		indicators = {
 			raidTarget = {anchorTo = "$parent", anchorPoint = "C", size = 20, x = 0, y = 0},
+			class = {anchorTo = "$parent", anchorPoint = "BL", size = 16, x = 0, y = 0},
 			masterLoot = {anchorTo = "$parent", anchorPoint = "TL", size = 12, x = 16, y = -10},
 			leader = {anchorTo = "$parent", anchorPoint = "TL", size = 14, x = 2, y = -12},
 			pvp = {anchorTo = "$parent", anchorPoint = "TR", size = 22, x = 11, y = -21},

modules/indicators.lua

@@ -1,8 +1,22 @@
-local Indicators = {list = {"status", "pvp", "leader", "masterLoot", "raidTarget", "happiness", "ready", "role", "lfdRole"}}
+local Indicators = {list = {"status", "pvp", "leader", "masterLoot", "raidTarget", "happiness", "ready", "role", "lfdRole", "class"}}
 local leavingWorld
 
 ShadowUF:RegisterModule(Indicators, "indicators", ShadowUF.L["Indicators"])
 
+function Indicators:UpdateClass(frame)
+	if( not frame.indicators.class or not frame.indicators.class.enabled ) then return end
+	
+	local class = select(2, UnitClass(frame.unit))
+	if( UnitIsPlayer(frame.unit) and class ) then
+		local coords = CLASS_BUTTONS[class]
+		frame.indicators.class:SetTexture("Interface\\Glues\\CharacterCreate\\UI-CharacterCreate-Classes")
+		frame.indicators.class:SetTexCoord(coords[1], coords[2], coords[3], coords[4])
+		frame.indicators.class:Show()
+	else
+		frame.indicators.class:Hide()
+	end
+end
+
 function Indicators:UpdateHappiness(frame)
 	if( not frame.indicators.happiness or not frame.indicators.happiness.enabled ) then return end
 
@@ -253,6 +267,11 @@ function Indicators:OnEnable(frame)
 
 		frame.indicators.pvp = frame.indicators.pvp or frame.indicators:CreateTexture(nil, "OVERLAY")
 	end
+
+	if( config.indicators.class and config.indicators.class.enabled ) then
+		frame:RegisterUpdateFunc(self, "UpdateClass")
+		frame.indicators.class = frame.indicators.class or frame.indicators:CreateTexture(nil, "OVERLAY")
+	end
 
 	if( config.indicators.leader and config.indicators.leader.enabled ) then
 		frame:RegisterNormalEvent("PARTY_LEADER_CHANGED", self, "UpdateLeader")

modules/layout.lua

@@ -365,7 +365,7 @@ function Layout:SetupFontString(fontString, extraSize)
 	fontString:SetFont(mediaPath.font, size, ShadowUF.db.profile.font.extra)
 
 	if( ShadowUF.db.profile.font.shadowColor and ShadowUF.db.profile.font.shadowX and ShadowUF.db.profile.font.shadowY ) then
-		fontString:SetShadowColor(ShadowUF.db.profile.font.shadowColor.r, ShadowUF.db.profile.font.shadowColor.g, ShadowUF.db.profile.font.shadowColor.b, ShadowUF.db.profile.font.a)
+		fontString:SetShadowColor(ShadowUF.db.profile.font.shadowColor.r, ShadowUF.db.profile.font.shadowColor.g, ShadowUF.db.profile.font.shadowColor.b, ShadowUF.db.profile.font.shadowColor.a)
 		fontString:SetShadowOffset(ShadowUF.db.profile.font.shadowX, ShadowUF.db.profile.font.shadowY)
 	else
 		fontString:SetShadowColor(0, 0, 0, 0)
@@ -390,6 +390,7 @@ function Layout:SetupText(frame, config)
 		if( parent and parent:IsShown() and row.enabled and row.text ~= "" ) then
 			local fontString = frame.fontStrings[id] or frame.highFrame:CreateFontString(nil, "ARTWORK")
 			self:SetupFontString(fontString, row.size)
+			fontString:SetTextColor(ShadowUF.db.profile.font.color.r, ShadowUF.db.profile.font.color.g, ShadowUF.db.profile.font.color.b, ShadowUF.db.profile.font.color.a)
 			fontString:SetText(row.text)
 			fontString:SetJustifyH(self:GetJustify(row))
 			self:AnchorFrame(frame, fontString, row)

modules/range.lua

@@ -7,14 +7,17 @@ ShadowUF:RegisterModule(Range, "range", ShadowUF.L["Range indicator"])
 
 local playerClass = select(2, UnitClass("player"))
 local friendlySpell, hostileSpell
+local resurrectSpell = Range.resurrect[playerClass]
 
 local function checkRange(self, elapsed)
 	self.timeElapsed = self.timeElapsed + elapsed
 	if( self.timeElapsed <= 0.50 ) then return end
 	self.timeElapsed = 0
 
+	if( self.isFriendly and resurrectSpell and UnitIsDead(self.parent.unit) ) then
+		self.parent:SetRangeAlpha(IsSpellInRange(resurrectSpell, self.parent.unit) == 1 and ShadowUF.db.profile.units[self.parent.unitType].range.inAlpha or ShadowUF.db.profile.units[self.parent.unitType].range.oorAlpha)
 	-- We set a spell for them in our flags check, use that
-	if( self.spell ) then
+	elseif( self.spell ) then
 		self.parent:SetRangeAlpha(IsSpellInRange(self.spell, self.parent.unit) == 1 and ShadowUF.db.profile.units[self.parent.unitType].range.inAlpha or ShadowUF.db.profile.units[self.parent.unitType].range.oorAlpha)
 	-- That didn't work, but they are grouped lets try the actual API for this, it's a bit flaky though and not that useful generally
 	elseif( self.grouped ) then
@@ -47,11 +50,6 @@ function Range:OnEnable(frame)
 
 	frame:RegisterUpdateFunc(self, "UpdateFlags")
 	frame:RegisterUpdateFunc(self, "ForceUpdate")
-
-	-- RRU and PMC don't fire when a target is dead and comes back up, check health for a state change.
-	if( self.resurrect[playerClass] ) then
-		frame:RegisterUnitEvent("UNIT_HEALTH", self, "CheckHealth")
-	end
 end
 
 function Range:OnLayoutApplied(frame)
@@ -70,22 +68,12 @@ function Range:OnDisable(frame)
 	end
 end
 
-function Range:CheckHealth(frame)
-	local isDead = UnitIsDead(frame.unit)
-	if( isDead and not frame.range.isDead or not isDead and frame.range.isDead ) then
-		frame.range.isDead = isDead
-		
-		self:UpdateFlags(frame)
-		self:ForceUpdate(frame)
-	end
-end
-
 -- I'd rather store the flags here, they rarely change and we can do that based off events, no sense in doing it eveyr 0.50s
 function Range:UpdateFlags(frame)
 	frame.range.canAttack = UnitCanAttack("player", frame.unit)
 	frame.range.isFriendly = UnitIsFriend("player", frame.unit) and UnitCanAssist("player", frame.unit)
 	frame.range.grouped = UnitInRaid(frame.unit) or UnitInParty(frame.unit)
-	frame.range.spell = UnitIsDead(frame.unit) and frame.range.isFriendly and self.resurrect[playerClass] or frame.range.canAttack and frame.range.hostileSpell or frame.range.isFriendly and frame.range.friendlySpell or nil
+	frame.range.spell = frame.range.canAttack and frame.range.hostileSpell or frame.range.isFriendly and frame.range.friendlySpell or nil
 
 	-- No sense in updating range if we have no data
 	if( UnitIsGhost(frame.unit) or not UnitIsConnected(frame.unit) or ( not frame.range.spell and not frame.range.grouped and not frame.range.isFriendly ) ) then

modules/units.lua

@@ -150,7 +150,9 @@ local function OnHide(self)
 	self:SetScript("OnEvent", nil)
 
 	-- If it's a volatile such as target or focus, next time it's shown it has to do an update
-	if( self.isUnitVolatile ) then
+	-- OR if the unit is still shown, but it's been hidden because our parent (Basically UIParent)
+	-- we want to flag it as having changed so it can be updated
+	if( self.isUnitVolatile or self:IsShown() ) then
 		self.unitGUID = nil
 	end
 end
@@ -668,6 +670,8 @@ function Units:SetHeaderAttributes(frame, type)
 	local config = ShadowUF.db.profile.units[type]
 	local xMod = config.attribPoint == "LEFT" and 1 or config.attribPoint == "RIGHT" and -1 or 0
 	local yMod = config.attribPoint == "TOP" and -1 or config.attribPoint == "BOTTOM" and 1 or 0
+	local widthMod = (config.attribPoint == "LEFT" or config.attribPoint == "RIGHT") and MEMBERS_PER_RAID_GROUP or 1
+	local heightMod = (config.attribPoint == "TOP" or config.attribPoint == "BOTTOM") and MEMBERS_PER_RAID_GROUP or 1
 
 	frame:SetAttribute("point", config.attribPoint)
 	frame:SetAttribute("sortMethod", config.sortMethod)
@@ -687,10 +691,11 @@ function Units:SetHeaderAttributes(frame, type)
 		for id=1, 8 do
 			local childHeader = headerFrames["raid" .. id]
 			if( childHeader and childHeader:IsVisible() ) then
-				childHeader:SetAttribute("minWidth", config.width)
-				childHeader:SetAttribute("minHeight", config.height * 5)
 				childHeader:SetAttribute("showRaid", ShadowUF.db.profile.locked and true)
 
+				childHeader:SetAttribute("minWidth", config.width * widthMod)
+				childHeader:SetAttribute("minHeight", config.height * heightMod)
+				
 				if( childHeader ~= frame ) then
 					childHeader:SetAttribute("point", config.attribPoint)
 					childHeader:SetAttribute("sortMethod", config.sortMethod)
@@ -815,6 +820,10 @@ function Units:LoadSplitGroupHeader(type)
 				frame.unitType = type
 				frame.splitParent = type
 				frame.groupID = id
+				--frame:SetBackdrop({bgFile = "Interface\\ChatFrame\\ChatFrameBackground", edgeFile = "Interface\\ChatFrame\\ChatFrameBackground", edgeSize = 1})
+				--frame:SetBackdropBorderColor(1, 0, 0, 1)
+				--frame:SetBackdropColor(0, 0, 0, 0)
+				
 				headerFrames["raid" .. id] = frame
 			end
 

options/config.lua

@@ -36,13 +36,13 @@ local PAGE_DESC = {
 	["tags"] = L["Advanced tag management, allows you to add your own custom tags."],
 	["filter"] = L["Simple aura filtering by whitelists and blacklists."],
 }
-local INDICATOR_NAMES = {["happiness"] = L["Happiness"], ["leader"] = L["Leader"], ["lfdRole"] = L["Dungeon role"], ["masterLoot"] = L["Master looter"], ["pvp"] = L["PvP Flag"],["raidTarget"] = L["Raid target"], ["ready"] = L["Ready status"], ["role"] = L["Raid role"], ["status"] = L["Combat status"],}
+local INDICATOR_NAMES = {["happiness"] = L["Happiness"], ["leader"] = L["Leader"], ["lfdRole"] = L["Dungeon role"], ["masterLoot"] = L["Master looter"], ["pvp"] = L["PvP Flag"],["raidTarget"] = L["Raid target"], ["ready"] = L["Ready status"], ["role"] = L["Raid role"], ["status"] = L["Combat status"], ["class"] = L["Class icon"]}
 local AREA_NAMES = {["arena"] = L["Arenas"],["none"] = L["Everywhere else"], ["party"] = L["Party instances"], ["pvp"] = L["Battlegrounds"], ["raid"] = L["Raid instances"],}
 local INDICATOR_DESC = {["happiness"] = L["Indicator for your pet's happiness, only applies to Hunters."],
 		["leader"] = L["Crown indicator for group leaders."], ["lfdRole"] = L["Role the unit is playing in dungeons formed through the Looking For Dungeon system."],
 		["masterLoot"] = L["Bag indicator for master looters."], ["pvp"] = L["PVP flag indicator, Horde for Horde flagged pvpers and Alliance for Alliance flagged pvpers."],
 		["raidTarget"] = L["Raid target indicator."], ["ready"] = L["Ready status of group members."],
-		["role"] = L["Raid role indicator, adds a shield indicator for main tanks and a sword icon for main assists."], ["status"] = L["Status indicator, shows if the unit is currently in combat. For the plyer it will also show if you are rested."],}
+		["role"] = L["Raid role indicator, adds a shield indicator for main tanks and a sword icon for main assists."], ["status"] = L["Status indicator, shows if the unit is currently in combat. For the player it will also show if you are rested."], ["class"] = L["Class icon for players."]}
 local TAG_GROUPS = {["classification"] = L["Classifications"], ["health"] = L["Health"], ["misc"] = L["Miscellaneous"], ["playerthreat"] = L["Player threat"], ["power"] = L["Power"], ["status"] = L["Status"], ["threat"] = L["Threat"], ["raid"] = L["Raid"],}
 
 local pointPositions = {["BOTTOM"] = L["Bottom"], ["TOP"] = L["Top"], ["LEFT"] = L["Left"], ["RIGHT"] = L["Right"], ["TOPLEFT"] = L["Top Left"], ["TOPRIGHT"] = L["Top Right"], ["BOTTOMLEFT"] = L["Bottom Left"], ["BOTTOMRIGHT"] = L["Bottom Right"], ["CENTER"] = L["Center"]}
@@ -826,8 +826,20 @@ local function loadGeneralOptions()
 						inline = true,
 						name = L["Font"],
 						args = {
-							font = {
+							color = {
 								order = 1,
+								type = "color",
+								name = L["Default color"],
+								desc = L["Default font color, any color tags inside individual tag texts will override this."],
+								hasAlpha = true,
+								set = setColor,
+								get = getColor,
+								arg = "font.color",
+								hidden = hideAdvancedOption,
+							},
+							sep = {order = 1.25, type = "description", name = "", hidden = hideAdvancedOption},
+							font = {
+								order = 1.5,
 								type = "select",
 								name = L["Font"],
 								dialogControl = "LSM30_Font",