👌 IMPROVE: Updated some skins

Merathilis · Jul 28, 2024 · c7883e4 · c7883e4
1 parent 8e082b7
commit c7883e4
Show file tree

Hide file tree

Showing 11 changed files with 54 additions and 33 deletions.
diff --git a/ElvUI_MerathilisUI/Modules/Skins/AddOns/Misc.lua b/ElvUI_MerathilisUI/Modules/Skins/AddOns/Misc.lua
@@ -79,16 +79,6 @@ function module:BlizzMisc()
 		module:CreateShadow(_G.ChatConfigFrame)
 	end
 
-	-- Mirror Timers
-	if E.private.skins.blizzard.mirrorTimers then
-		hooksecurefunc(_G.MirrorTimerContainer, "SetupTimer", function(container, timer)
-			local bar = container:GetAvailableTimer(timer)
-			if bar then
-				module:CreateShadow(bar)
-			end
-		end)
-	end
-
 	if _G.ActionStatus.Text then
 		F.SetFontDB(_G.ActionStatus.Text, E.private.mui.skins.actionStatus)
 	end

diff --git a/ElvUI_MerathilisUI/Modules/Skins/ElvUI/Bags.lua b/ElvUI_MerathilisUI/Modules/Skins/ElvUI/Bags.lua
@@ -1,11 +1,13 @@
 local MER, F, E, I, V, P, G, L = unpack(ElvUI_MerathilisUI)
-local S = MER:GetModule("MER_Skins")
+local module = MER:GetModule("MER_Skins")
 local B = E:GetModule("Bags")
 
 local _G = _G
 local pairs = pairs
 
-function S:ElvUI_Bags()
+local NUM_CONTAINER_FRAMES = NUM_CONTAINER_FRAMES
+
+function module:ElvUI_ContainerFrames()
 	if not E.private.bags.enable then
 		return
 	end
@@ -16,28 +18,35 @@ function S:ElvUI_Bags()
 	self:CreateShadow(B.BankFrame.ContainerHolder)
 end
 
-function S:ElvUI_BagBar()
-	if not E.private.bags.enable then
+function module:ContainerFrame()
+	print("hitsss")
+	if E.private.bags.enable then
 		return
 	end
 
-	if E.private.bags.bagBar and B.BagBar and B.BagBar.buttons then
-		for _, buttons in pairs(B.BagBar.buttons) do
-			self:CreateShadow(buttons)
+	for bagID = 1, NUM_CONTAINER_FRAMES do
+		local container = _G["ContainerFrame" .. bagID]
+		if container and container.template then
+			self:CreateShadow(container)
 		end
+		print(container)
 	end
-end
 
-function S:ElvUI_BagSell()
-	if not E.private.bags.enable then
-		return
+	self:CreateShadow(_G.ContainerFrameCombinedBags)
+
+	-- Bank
+	self:CreateShadow(_G.BankFrame)
+
+	for _, frame in pairs({ _G.BankSlotsFrame, _G.ReagentBankFrame, _G.AccountBankPanel }) do
+		if frame and frame.EdgeShadows then
+			frame.EdgeShadows:SetAlpha(0)
+		end
 	end
 
-	if B and B.SellFrame then
-		self:CreateBackdropShadow(B.SellFrame)
+	for _, tab in pairs(_G.BankFrame.Tabs) do
+		self:ReskinTab(tab)
 	end
 end
 
-S:AddCallback("ElvUI_Bags")
-S:AddCallback("ElvUI_BagBar")
-S:AddCallback("ElvUI_BagSell")
+module:AddCallback("ContainerFrame")
+module:AddCallback("ElvUI_ContainerFrames")
diff --git a/ElvUI_MerathilisUI/Modules/Skins/FrameXML/AddonList.lua b/ElvUI_MerathilisUI/Modules/Skins/FrameXML/AddonList.lua
@@ -1,5 +1,5 @@
 local MER, F, E, I, V, P, G, L = unpack(ElvUI_MerathilisUI)
-local module = MER.Modules.Skins
+local module = MER:GetModule("MER_Skins")
 
 local _G = _G
 

diff --git a/ElvUI_MerathilisUI/Modules/Skins/FrameXML/BNet.lua b/ElvUI_MerathilisUI/Modules/Skins/FrameXML/BNet.lua
@@ -1,5 +1,5 @@
 local MER, F, E, I, V, P, G, L = unpack(ElvUI_MerathilisUI)
-local module = MER.Modules.Skins
+local module = MER:GetModule("MER_Skins")
 local S = E:GetModule("Skins")
 
 local _G = _G

diff --git a/ElvUI_MerathilisUI/Modules/Skins/FrameXML/BagFrame.lua b/ElvUI_MerathilisUI/Modules/Skins/FrameXML/BagFrame.lua
@@ -1,5 +1,5 @@
 local MER, F, E, I, V, P, G, L = unpack(ElvUI_MerathilisUI)
-local module = MER.Modules.Skins
+local module = MER:GetModule("MER_Skins")
 
 local _G = _G
 

diff --git a/ElvUI_MerathilisUI/Modules/Skins/FrameXML/ChatFrame.lua b/ElvUI_MerathilisUI/Modules/Skins/FrameXML/ChatFrame.lua
@@ -1,5 +1,5 @@
 local MER, F, E, I, V, P, G, L = unpack(ElvUI_MerathilisUI)
-local module = MER.Modules.Skins
+local module = MER:GetModule("MER_Skins")
 
 local _G = _G
 

diff --git a/ElvUI_MerathilisUI/Modules/Skins/FrameXML/EventToastManager.lua b/ElvUI_MerathilisUI/Modules/Skins/FrameXML/EventToastManager.lua
@@ -1,5 +1,5 @@
 local MER, F, E, I, V, P, G, L = unpack(ElvUI_MerathilisUI)
-local module = MER.Modules.Skins
+local module = MER:GetModule("MER_Skins")
 
 local _G = _G
 

diff --git a/ElvUI_MerathilisUI/Modules/Skins/FrameXML/GameMenuFrame.lua b/ElvUI_MerathilisUI/Modules/Skins/FrameXML/GameMenuFrame.lua
@@ -1,5 +1,5 @@
 local MER, F, E, I, V, P, G, L = unpack(ElvUI_MerathilisUI)
-local module = MER.Modules.Skins
+local module = MER:GetModule("MER_Skins")
 
 local _G = _G
 

diff --git a/ElvUI_MerathilisUI/Modules/Skins/FrameXML/GhostFrame.lua b/ElvUI_MerathilisUI/Modules/Skins/FrameXML/GhostFrame.lua
@@ -1,5 +1,5 @@
 local MER, F, E, I, V, P, G, L = unpack(ElvUI_MerathilisUI)
-local module = MER.Modules.Skins
+local module = MER:GetModule("MER_Skins")
 
 local _G = _G
 

diff --git a/ElvUI_MerathilisUI/Modules/Skins/FrameXML/Load_FrameXML.xml b/ElvUI_MerathilisUI/Modules/Skins/FrameXML/Load_FrameXML.xml
@@ -23,6 +23,7 @@
 	<Script file="LootFrame.lua"/>
 	<Script file="MailFrame.lua"/>
 	<Script file="MerchantFrame.lua"/>
+	<Script file="MirrorTimers.lua"/>
 	<Script file="PaperDollFrame.lua"/>
 	<Script file="PVEFrame.lua"/>
 	<Script file="QuestFrame.lua"/>

diff --git a/ElvUI_MerathilisUI/Modules/Skins/FrameXML/MirrorTimers.lua b/ElvUI_MerathilisUI/Modules/Skins/FrameXML/MirrorTimers.lua
@@ -0,0 +1,21 @@
+local MER, F, E, I, V, P, G, L = unpack(ElvUI_MerathilisUI)
+local module = MER:GetModule("MER_Skins")
+
+local _G = _G
+
+function module:MirrorTimers()
+	if not self:CheckDB("mirrorTimers") then
+		return
+	end
+
+	hooksecurefunc(_G.MirrorTimerContainer, "SetupTimer", function(container, timer)
+		local bar = container:GetAvailableTimer(timer)
+		if not bar then
+			return
+		end
+
+		self:CreateShadow(bar)
+	end)
+end
+
+module:AddCallback("MirrorTimers")