Merge branch 'master' of https://github.com/Tercioo/Details-Damage-Meter

classes/class_instance.lua

@@ -1791,8 +1791,8 @@ local createStatusbarOptions = function(optionsTable)
 	newTable.textColor = optionsTable.textColor
 	newTable.textSize = optionsTable.textSize
 	newTable.textFace = optionsTable.textFace
-	newTable.textXmod = optionsTable.textXmod
-	newTable.textYmod = optionsTable.textYmod
+	newTable.textXMod = optionsTable.textXMod
+	newTable.textYMod = optionsTable.textYMod
 	newTable.isHidden = optionsTable.isHidden
 	newTable.segmentType = optionsTable.segmentType
 	newTable.textAlign = optionsTable.textAlign

frames/window_main.lua

@@ -803,6 +803,7 @@ local function move_janela(baseframe, iniciando, instancia, just_updating)
 				instancia_alvo:SaveMainWindowPosition()
 				instancia_alvo:RestoreMainWindowPosition()
 
+				instancia_alvo:ShutDown()
 				Details.FadeHandler.Fader(instancia_alvo.baseframe, 1)
 				Details.FadeHandler.Fader(instancia_alvo.rowframe, parseRowFrameAlpha(1))
 				Details.FadeHandler.Fader(instancia_alvo.baseframe.cabecalho.ball, 1)

functions/profiles.lua

@@ -411,6 +411,10 @@ function _detalhes:ApplyProfile (profile_name, nosave, is_copy)
 					instance:RestoreMainWindowPosition()
 					instance:ReajustaGump()
 					--instance:SaveMainWindowPosition()
+					--Load StatusBarSaved values and options.
+					instance.StatusBarSaved = skin.StatusBarSaved or {options = {}}
+					instance.StatusBar.options = instance.StatusBarSaved.options
+					_detalhes.StatusBar:UpdateChilds (instance)
 					instance:ChangeSkin()
 
 				else

functions/spells.lua

@@ -3061,11 +3061,31 @@ do
 
 	}
 
+	local cooldownKeys = { --LIB_OPEN_RAID_COOLDOWNS_INFO types
+		[1] = true,
+		[2] = true,
+		[3] = true,
+		[4] = true,
+		[5] = true,
+		[6] = true,
+		[7] = true,
+		[8] = true,
+	}
+
 	local getCooldownsForClass = function(class)
 		local result = {}
-		for spellId, spellInfo in pairs(_G.DetailsFramework.CooldownsInfo) do
-			if (class == spellInfo.class) then
-				result[#result+1] = spellId
+		--Use LibOpenRaid if possible. Otherwise fallback to DF.
+		if (LIB_OPEN_RAID_COOLDOWNS_INFO) then
+			for spellId, spellInfo in pairs(LIB_OPEN_RAID_COOLDOWNS_INFO) do
+				if (class == spellInfo.class and cooldownKeys[spellInfo.type]) then
+					result[#result+1] = spellId
+				end
+			end
+		else
+			for spellId, spellInfo in pairs(_G.DetailsFramework.CooldownsInfo) do
+				if (class == spellInfo.class) then
+					result[#result+1] = spellId
+				end
 			end
 		end
 		return result
@@ -3073,7 +3093,9 @@ do
 
 	_detalhes.DefensiveCooldownSpells = {
 		["DEATHKNIGHT"] = getCooldownsForClass("DEATHKNIGHT"),
+		["DEMONHUNTER"] = getCooldownsForClass("DEMONHUNTER"),
 		["DRUID"] = getCooldownsForClass("DRUID"),
+		["EVOKER"] = getCooldownsForClass("EVOKER"),
 		["HUNTER"] = getCooldownsForClass("HUNTER"),
 		["MAGE"] = getCooldownsForClass("MAGE"),
 		["MONK"] = getCooldownsForClass("MONK"),