Quantcast

Updated the Enhanced Shadows compability to check for ElvUI_NenaUI rather than ElvUI_KitUI, and renamed enhancedshdows.lua to enhancedshadows.lua.

Michael Tindal [09-05-17 - 04:15]
Updated the Enhanced Shadows compability to check for ElvUI_NenaUI rather than ElvUI_KitUI, and renamed enhancedshdows.lua to enhancedshadows.lua.
Filename
ElvUI_SLE/core/core.lua
ElvUI_SLE/modules/enhancedshadows.lua
ElvUI_SLE/modules/enhancedshdows.lua
ElvUI_SLE/modules/load_modules.xml
ElvUI_SLE/modules/vehicle.lua
ElvUI_SLE/options/enhancedshadows_c.lua
diff --git a/ElvUI_SLE/core/core.lua b/ElvUI_SLE/core/core.lua
index 3285819..e009589 100644
--- a/ElvUI_SLE/core/core.lua
+++ b/ElvUI_SLE/core/core.lua
@@ -102,7 +102,7 @@ local _CompList = {
 	"ElvUI_Enhanced",
 	"DejaCharacterStats",
 	"ElvUI_ExtraActionBars",
-	"ElvUI_KitUI",
+	"ElvUI_NenaUI",
 	"TradeSkillMaster",
 	"WorldQuestTracker",
 }
diff --git a/ElvUI_SLE/modules/enhancedshadows.lua b/ElvUI_SLE/modules/enhancedshadows.lua
new file mode 100644
index 0000000..109c6e9
--- /dev/null
+++ b/ElvUI_SLE/modules/enhancedshadows.lua
@@ -0,0 +1,183 @@
+local SLE, T, E, L, V, P, G = unpack(select(2, ...))
+if SLE._Compatibility["ElvUI_NenaUI"] then return end
+local ES = SLE:NewModule('EnhancedShadows', 'AceEvent-3.0')
+local AB, UF = SLE:GetElvModules("ActionBars", "UnitFrames")
+local ClassColor = RAID_CLASS_COLORS[E.myclass]
+local Border, LastSize
+local Abars = SLE._Compatibility["ElvUI_ExtraActionBars"] and 10 or 6
+--GLOBALS: hooksecurefunc
+local _G = _G
+local UnitAffectingCombat = UnitAffectingCombat
+
+ES.shadows = {}
+
+local UFrames = {
+	{"player", "Player"},
+	{"target", "Target"},
+	{"targettarget", "TargetTarget"},
+	{"focus", "Focus"},
+	{"focustarget", "FocusTarget"},
+	{"pet", "Pet"},
+	{"pettarget", "PetTarget"},
+}
+
+local UGroups = {
+	{"boss", "Boss", 5},
+	{"arena", "Arena", 5},
+}
+
+function ES:UpdateShadows()
+	if UnitAffectingCombat('player') then ES:RegisterEvent('PLAYER_REGEN_ENABLED', ES.UpdateShadows) return end
+
+	for frame, _ in T.pairs(ES.shadows) do
+		ES:UpdateShadow(frame)
+	end
+end
+
+function ES:RegisterShadow(shadow, frame)
+	if shadow.isRegistered then return end
+	ES.shadows[shadow] = true
+	shadow.isRegistered = true
+end
+
+function ES:UpdateFrame(frame, db)
+	if not frame or not frame.EnhShadow then return end
+	local size = E.db.sle.shadows.size
+	if frame.USE_MINI_POWERBAR then
+		frame.EnhShadow:SetOutside(frame.Health, size, size)
+	else
+		frame.EnhShadow:SetOutside(frame, size, size)
+	end
+end
+
+function ES:CreateShadows()
+	for i = 1, #UFrames do
+		local unit, name = T.unpack(UFrames[i])
+		if E.private.sle.module.shadows[unit] then
+			local frame = _G["ElvUF_"..name]
+			frame:CreateShadow()
+			frame.EnhShadow = frame.shadow
+			frame.shadow = nil
+			ES:RegisterShadow(frame.EnhShadow)
+			frame.EnhShadow:SetParent(frame)
+			hooksecurefunc(UF, "Update_"..name.."Frame", ES.UpdateFrame)
+		end
+	end
+	for i = 1, #UGroups do
+		local unit, name, num = T.unpack(UGroups[i])
+		if E.private.sle.module.shadows[unit] then
+			for j = 1, num do
+				local frame = _G["ElvUF_"..name..j]
+				frame:CreateShadow()
+				frame.EnhShadow = frame.shadow
+				frame.shadow = nil
+				ES:RegisterShadow(frame.EnhShadow)
+				frame.EnhShadow:SetParent(frame)
+				hooksecurefunc(UF, "Update_"..name.."Frames", ES.UpdateFrame)
+			end
+		end
+	end
+	for i=1, Abars do
+		if E.private.sle.module.shadows.actionbars["bar"..i] then
+			local frame = _G["ElvUI_Bar"..i]
+			frame:CreateShadow()
+			frame.EnhShadow = frame.shadow
+			frame.shadow = nil
+			ES:RegisterShadow(frame.EnhShadow)
+			frame.EnhShadow:SetParent(frame.backdrop)
+		end
+		if E.private.sle.module.shadows.actionbars["bar"..i.."buttons"] then
+			for j = 1, 12 do
+				local frame = _G["ElvUI_Bar"..i.."Button"..j]
+				frame:CreateShadow()
+				frame.EnhShadow = frame.shadow
+				frame.shadow = nil
+				ES:RegisterShadow(frame.EnhShadow)
+				frame.EnhShadow:SetParent(frame.backdrop)
+			end
+		end
+	end
+	if E.private.sle.module.shadows.actionbars.stancebar then
+		local frame = _G["ElvUI_StanceBar"]
+		frame:CreateShadow()
+		frame.EnhShadow = frame.shadow
+		frame.shadow = nil
+		ES:RegisterShadow(frame.EnhShadow)
+		frame.EnhShadow:SetParent(frame.backdrop)
+	end
+	if E.private.sle.module.shadows.actionbars.stancebarbuttons then
+		for i = 1, 12 do
+			local frame = _G["ElvUI_StanceBarButton"..i]
+			if not frame then break end
+			frame:CreateShadow()
+			frame.EnhShadow = frame.shadow
+			frame.shadow = nil
+			ES:RegisterShadow(frame.EnhShadow)
+			frame.EnhShadow:SetParent(frame.backdrop)
+		end
+	end
+	if E.private.sle.module.shadows.actionbars.microbar then
+		local frame = _G["ElvUI_MicroBar"]
+		frame:CreateShadow()
+		frame.EnhShadow = frame.shadow
+		frame.shadow = nil
+		ES:RegisterShadow(frame.EnhShadow)
+	end
+	if E.private.sle.module.shadows.actionbars.microbarbuttons then
+		for i=1, (#MICRO_BUTTONS) do
+			local frame = _G[MICRO_BUTTONS[i]]
+			if not frame then break end
+			frame:CreateShadow()
+			frame.EnhShadow = frame.shadow
+			frame.shadow = nil
+			ES:RegisterShadow(frame.EnhShadow)
+			frame.EnhShadow:SetParent(frame.backdrop)
+		end
+	end
+	if E.private.sle.module.shadows.actionbars.petbar then
+		local frame = _G["ElvUI_BarPet"]
+		frame:CreateShadow()
+		frame.EnhShadow = frame.shadow
+		frame.shadow = nil
+		ES:RegisterShadow(frame.EnhShadow)
+		frame.EnhShadow:SetParent(frame.backdrop)
+	end
+	if E.private.sle.module.shadows.actionbars.petbarbuttons then
+		for i = 1, 12 do
+			local frame = _G["PetActionButton"..i]
+			if not frame then break end
+			frame:CreateShadow()
+			frame.EnhShadow = frame.shadow
+			frame.shadow = nil
+			ES:RegisterShadow(frame.EnhShadow)
+			frame.EnhShadow:SetParent(frame.backdrop)
+		end
+	end
+end
+
+function ES:UpdateShadow(shadow)
+	local ShadowColor = E.db.sle.shadows.shadowcolor
+	local r, g, b = ShadowColor['r'], ShadowColor['g'], ShadowColor['b']
+	if E.db.sle.shadows.classcolor then r, g, b = ClassColor['r'], ClassColor['g'], ClassColor['b'] end
+
+	local size = E.db.sle.shadows.size
+	shadow:SetOutside(shadow:GetParent(), size, size)
+	shadow:SetBackdrop({
+		edgeFile = Border, edgeSize = E:Scale(size > 3 and size or 3),
+		insets = {left = E:Scale(5), right = E:Scale(5), top = E:Scale(5), bottom = E:Scale(5)},
+	})
+	shadow:SetBackdropColor(r, g, b, 0)
+	shadow:SetBackdropBorderColor(r, g, b, 0.9)
+end
+
+function ES:Initialize()
+	if not SLE.initialized then return end
+	Border = E.LSM:Fetch('border', 'ElvUI GlowBorder')
+	ES:CreateShadows()
+	ES:UpdateShadows()
+	function ES:ForUpdateAll()
+		ES:UpdateShadows()
+	end
+end
+
+SLE:RegisterModule(ES:GetName())
\ No newline at end of file
diff --git a/ElvUI_SLE/modules/enhancedshdows.lua b/ElvUI_SLE/modules/enhancedshdows.lua
deleted file mode 100644
index e7bf04b..0000000
--- a/ElvUI_SLE/modules/enhancedshdows.lua
+++ /dev/null
@@ -1,183 +0,0 @@
-local SLE, T, E, L, V, P, G = unpack(select(2, ...))
-if SLE._Compatibility["ElvUI_KitUI"] then return end
-local ES = SLE:NewModule('EnhancedShadows', 'AceEvent-3.0')
-local AB, UF = SLE:GetElvModules("ActionBars", "UnitFrames")
-local ClassColor = RAID_CLASS_COLORS[E.myclass]
-local Border, LastSize
-local Abars = SLE._Compatibility["ElvUI_ExtraActionBars"] and 10 or 6
---GLOBALS: hooksecurefunc
-local _G = _G
-local UnitAffectingCombat = UnitAffectingCombat
-
-ES.shadows = {}
-
-local UFrames = {
-	{"player", "Player"},
-	{"target", "Target"},
-	{"targettarget", "TargetTarget"},
-	{"focus", "Focus"},
-	{"focustarget", "FocusTarget"},
-	{"pet", "Pet"},
-	{"pettarget", "PetTarget"},
-}
-
-local UGroups = {
-	{"boss", "Boss", 5},
-	{"arena", "Arena", 5},
-}
-
-function ES:UpdateShadows()
-	if UnitAffectingCombat('player') then ES:RegisterEvent('PLAYER_REGEN_ENABLED', ES.UpdateShadows) return end
-
-	for frame, _ in T.pairs(ES.shadows) do
-		ES:UpdateShadow(frame)
-	end
-end
-
-function ES:RegisterShadow(shadow, frame)
-	if shadow.isRegistered then return end
-	ES.shadows[shadow] = true
-	shadow.isRegistered = true
-end
-
-function ES:UpdateFrame(frame, db)
-	if not frame or not frame.EnhShadow then return end
-	local size = E.db.sle.shadows.size
-	if frame.USE_MINI_POWERBAR then
-		frame.EnhShadow:SetOutside(frame.Health, size, size)
-	else
-		frame.EnhShadow:SetOutside(frame, size, size)
-	end
-end
-
-function ES:CreateShadows()
-	for i = 1, #UFrames do
-		local unit, name = T.unpack(UFrames[i])
-		if E.private.sle.module.shadows[unit] then
-			local frame = _G["ElvUF_"..name]
-			frame:CreateShadow()
-			frame.EnhShadow = frame.shadow
-			frame.shadow = nil
-			ES:RegisterShadow(frame.EnhShadow)
-			frame.EnhShadow:SetParent(frame)
-			hooksecurefunc(UF, "Update_"..name.."Frame", ES.UpdateFrame)
-		end
-	end
-	for i = 1, #UGroups do
-		local unit, name, num = T.unpack(UGroups[i])
-		if E.private.sle.module.shadows[unit] then
-			for j = 1, num do
-				local frame = _G["ElvUF_"..name..j]
-				frame:CreateShadow()
-				frame.EnhShadow = frame.shadow
-				frame.shadow = nil
-				ES:RegisterShadow(frame.EnhShadow)
-				frame.EnhShadow:SetParent(frame)
-				hooksecurefunc(UF, "Update_"..name.."Frames", ES.UpdateFrame)
-			end
-		end
-	end
-	for i=1, Abars do
-		if E.private.sle.module.shadows.actionbars["bar"..i] then
-			local frame = _G["ElvUI_Bar"..i]
-			frame:CreateShadow()
-			frame.EnhShadow = frame.shadow
-			frame.shadow = nil
-			ES:RegisterShadow(frame.EnhShadow)
-			frame.EnhShadow:SetParent(frame.backdrop)
-		end
-		if E.private.sle.module.shadows.actionbars["bar"..i.."buttons"] then
-			for j = 1, 12 do
-				local frame = _G["ElvUI_Bar"..i.."Button"..j]
-				frame:CreateShadow()
-				frame.EnhShadow = frame.shadow
-				frame.shadow = nil
-				ES:RegisterShadow(frame.EnhShadow)
-				frame.EnhShadow:SetParent(frame.backdrop)
-			end
-		end
-	end
-	if E.private.sle.module.shadows.actionbars.stancebar then
-		local frame = _G["ElvUI_StanceBar"]
-		frame:CreateShadow()
-		frame.EnhShadow = frame.shadow
-		frame.shadow = nil
-		ES:RegisterShadow(frame.EnhShadow)
-		frame.EnhShadow:SetParent(frame.backdrop)
-	end
-	if E.private.sle.module.shadows.actionbars.stancebarbuttons then
-		for i = 1, 12 do
-			local frame = _G["ElvUI_StanceBarButton"..i]
-			if not frame then break end
-			frame:CreateShadow()
-			frame.EnhShadow = frame.shadow
-			frame.shadow = nil
-			ES:RegisterShadow(frame.EnhShadow)
-			frame.EnhShadow:SetParent(frame.backdrop)
-		end
-	end
-	if E.private.sle.module.shadows.actionbars.microbar then
-		local frame = _G["ElvUI_MicroBar"]
-		frame:CreateShadow()
-		frame.EnhShadow = frame.shadow
-		frame.shadow = nil
-		ES:RegisterShadow(frame.EnhShadow)
-	end
-	if E.private.sle.module.shadows.actionbars.microbarbuttons then
-		for i=1, (#MICRO_BUTTONS) do
-			local frame = _G[MICRO_BUTTONS[i]]
-			if not frame then break end
-			frame:CreateShadow()
-			frame.EnhShadow = frame.shadow
-			frame.shadow = nil
-			ES:RegisterShadow(frame.EnhShadow)
-			frame.EnhShadow:SetParent(frame.backdrop)
-		end
-	end
-	if E.private.sle.module.shadows.actionbars.petbar then
-		local frame = _G["ElvUI_BarPet"]
-		frame:CreateShadow()
-		frame.EnhShadow = frame.shadow
-		frame.shadow = nil
-		ES:RegisterShadow(frame.EnhShadow)
-		frame.EnhShadow:SetParent(frame.backdrop)
-	end
-	if E.private.sle.module.shadows.actionbars.petbarbuttons then
-		for i = 1, 12 do
-			local frame = _G["PetActionButton"..i]
-			if not frame then break end
-			frame:CreateShadow()
-			frame.EnhShadow = frame.shadow
-			frame.shadow = nil
-			ES:RegisterShadow(frame.EnhShadow)
-			frame.EnhShadow:SetParent(frame.backdrop)
-		end
-	end
-end
-
-function ES:UpdateShadow(shadow)
-	local ShadowColor = E.db.sle.shadows.shadowcolor
-	local r, g, b = ShadowColor['r'], ShadowColor['g'], ShadowColor['b']
-	if E.db.sle.shadows.classcolor then r, g, b = ClassColor['r'], ClassColor['g'], ClassColor['b'] end
-
-	local size = E.db.sle.shadows.size
-	shadow:SetOutside(shadow:GetParent(), size, size)
-	shadow:SetBackdrop({
-		edgeFile = Border, edgeSize = E:Scale(size > 3 and size or 3),
-		insets = {left = E:Scale(5), right = E:Scale(5), top = E:Scale(5), bottom = E:Scale(5)},
-	})
-	shadow:SetBackdropColor(r, g, b, 0)
-	shadow:SetBackdropBorderColor(r, g, b, 0.9)
-end
-
-function ES:Initialize()
-	if not SLE.initialized then return end
-	Border = E.LSM:Fetch('border', 'ElvUI GlowBorder')
-	ES:CreateShadows()
-	ES:UpdateShadows()
-	function ES:ForUpdateAll()
-		ES:UpdateShadows()
-	end
-end
-
-SLE:RegisterModule(ES:GetName())
\ No newline at end of file
diff --git a/ElvUI_SLE/modules/load_modules.xml b/ElvUI_SLE/modules/load_modules.xml
index 1b5e91f..b8aa7de 100644
--- a/ElvUI_SLE/modules/load_modules.xml
+++ b/ElvUI_SLE/modules/load_modules.xml
@@ -11,7 +11,7 @@
 	<Script file='datatexts.lua'/>
 	<Script file='elvConfig.lua'/>
 	<Script file='equipmanager.lua'/>
-	<Script file='enhancedshdows.lua'/>
+	<Script file='enhancedshadows.lua'/>
 	<Script file='toolbars.lua'/>
 	<Script file='garrison.lua'/>
 	<Script file='orderhall.lua'/>
diff --git a/ElvUI_SLE/modules/vehicle.lua b/ElvUI_SLE/modules/vehicle.lua
index fe06223..82d4274 100644
--- a/ElvUI_SLE/modules/vehicle.lua
+++ b/ElvUI_SLE/modules/vehicle.lua
@@ -117,7 +117,7 @@ function EVB:Initialize()
 	if not SLE.initialized then return end
 	if not E.private.sle.vehicle.enable or not E.private.actionbar.enable then return end;

-	ES = SLE._Compatibility["ElvUI_KitUI"] and E:GetModule("EnhancedShadows") or SLE:GetModule("EnhancedShadows")
+	ES = SLE._Compatibility["ElvUI_NenaUI"] and ElvUI_NenaUI[1]:GetModule("EnhancedShadows") or SLE:GetModule("EnhancedShadows")

 	local visibility = "[petbattle] hide; [vehicleui][overridebar][shapeshift][possessbar] hide;"
 	local page = T.format("[vehicleui] %d; [possessbar] %d; [overridebar] %d; [shapeshift] 13;", GetVehicleBarIndex(), GetVehicleBarIndex(), GetOverrideBarIndex());
diff --git a/ElvUI_SLE/options/enhancedshadows_c.lua b/ElvUI_SLE/options/enhancedshadows_c.lua
index 3476c0a..17682a5 100644
--- a/ElvUI_SLE/options/enhancedshadows_c.lua
+++ b/ElvUI_SLE/options/enhancedshadows_c.lua
@@ -1,5 +1,5 @@
 local SLE, T, E, L, V, P, G = unpack(select(2, ...))
-if SLE._Compatibility["ElvUI_KitUI"] then return end
+if SLE._Compatibility["ElvUI_NenaUI"] then return end
 local ES = SLE:GetModule("EnhancedShadows")

 local function configTable()