From 82765a8bfec6067d7125fd7d29b0fd9f7422452e Mon Sep 17 00:00:00 2001
From: Crum <stschleyer89@gmail.com>
Date: Wed, 13 Dec 2017 19:06:08 -0600
Subject: [PATCH] move ReadyCheckFrame skin > Raid.lua due to Blizzard_RaidUI
 OnLoad

---
 .../6/7/ElvUI/Modules/Skins/Blizzard/Misc.lua | 12 +----
 .../6/7/ElvUI/Modules/Skins/Blizzard/Raid.lua | 50 ++++++-------------
 2 files changed, 15 insertions(+), 47 deletions(-)

diff --git a/2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/Misc.lua b/2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/Misc.lua
index 2be60ab..3ad1f28 100644
--- a/2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/Misc.lua
+++ b/2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/Misc.lua
@@ -8,6 +8,7 @@ local unpack = unpack
 local find = string.find
 local getn = table.getn
 --WoW API / Variables
+local IsAddOnLoaded = IsAddOnLoaded
 local UnitIsUnit = UnitIsUnit
 local hooksecurefunc = hooksecurefunc
 
@@ -25,7 +26,6 @@ local function LoadSkin()
 		"OptionsFrameMiscellaneous",
 		"SoundOptionsFrame",
 		"TicketStatusFrame",
-		"ReadyCheckFrame",
 		"StackSplitFrame",
 	    "DropDownList1MenuBackdrop",
 	    "DropDownList2MenuBackdrop",
@@ -33,9 +33,6 @@ local function LoadSkin()
 	    "DropDownList2Backdrop",
 	}
 
-	E:StripTextures(ReadyCheckFrame)
-	E:Kill(ReadyCheckPortrait)
-
 	for i = 1, getn(skins) do
 		E:SetTemplate(_G[skins[i]], "Transparent")
 	end
@@ -45,7 +42,6 @@ local function LoadSkin()
 		local width, height = (f:GetWidth() * .6), f:GetHeight()
 
 		local leftGrad = f:CreateTexture(nil, "HIGHLIGHT")
-		-- leftGrad:Size(width, height)
 		leftGrad:SetWidth(width)
 		leftGrad:SetHeight(height)
 		leftGrad:SetPoint("LEFT", f, "CENTER")
@@ -53,7 +49,6 @@ local function LoadSkin()
 		leftGrad:SetGradientAlpha("Horizontal", r, g, b, 0.35, r, g, b, 0)
 
 		local rightGrad = f:CreateTexture(nil, "HIGHLIGHT")
-		-- rightGrad:Size(width, height)
 		rightGrad:SetWidth(width)
 		rightGrad:SetHeight(height)
 		rightGrad:SetPoint("RIGHT", f, "CENTER")
@@ -146,8 +141,6 @@ local function LoadSkin()
 		"UIOptionsFrameDefaults",
 		"UIOptionsFrameOkay",
 		"UIOptionsFrameCancel",
-		"ReadyCheckFrameYesButton",
-		"ReadyCheckFrameNoButton",
 		"StackSplitOkayButton",
 		"StackSplitCancelButton",
 		"RolePollPopupAcceptButton"
@@ -169,9 +162,6 @@ local function LoadSkin()
 	SoundOptionsFrameOkay:SetPoint("RIGHT",SoundOptionsFrameCancel,"LEFT",-4,0)
 	UIOptionsFrameOkay:ClearAllPoints()
 	UIOptionsFrameOkay:SetPoint("RIGHT",UIOptionsFrameCancel,"LEFT", -4,0)
-	ReadyCheckFrameYesButton:SetPoint("RIGHT", ReadyCheckFrame, "CENTER", -1, 0)
-	ReadyCheckFrameNoButton:SetPoint("LEFT", ReadyCheckFrameYesButton, "RIGHT", 3, 0)
-	ReadyCheckFrameText:SetPoint("TOP", ReadyCheckFrame, "TOP", 0, -18)
 
 	-- others
 	ZoneTextFrame:ClearAllPoints()
diff --git a/2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/Raid.lua b/2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/Raid.lua
index 4fd426e..019a6b2 100644
--- a/2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/Raid.lua
+++ b/2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/Raid.lua
@@ -12,6 +12,7 @@ local hooksecurefunc = hooksecurefunc
 function LoadSkin()
 	-- if E.private.skins.blizzard.enable ~= true or E.private.skins.blizzard.raid ~= true then return end
 
+	-- RaidFrame
 	local StripAllTextures = {
 		"RaidGroup1",
 		"RaidGroup2",
@@ -44,42 +45,6 @@ function LoadSkin()
 		end
 	end
 
-	-- hooksecurefunc("RaidClassButton_Update", function()
-	-- 	local button, icon, count
-	-- 	for index, value in pairs(RAID_CLASS_BUTTONS) do
-	-- 		button = _G["RaidClassButton" .. value.button]
-	-- 		icon = _G["RaidClassButton" .. value.button .. "IconTexture"]
-	-- 		count = _G["RaidClassButton" .. value.button .. "Count"]
-
-	-- 		E:StripTextures(button)
-
-	-- 		if not button.backdrop then
-	-- 			E:CreateBackdrop(button, "Default")
-	-- 			E:SetOutside(button.backdrop, icon)
-	-- 		end
-
-	-- 		if button:GetID() == value.button then
-	-- 			button.class = index
-	-- 			if index == "PETS" then
-	-- 				icon:SetTexture("Interface\\RaidFrame\\UI-RaidFrame-Pets")
-	-- 				icon:SetTexCoord(unpack(E.TexCoords))
-	-- 			elseif index == "MAINTANK" then
-	-- 				icon:SetTexture("Interface\\RaidFrame\\UI-RaidFrame-MainTank")
-	-- 				icon:SetTexCoord(unpack(E.TexCoords))
-	-- 			elseif index == "MAINASSIST" then
-	-- 				icon:SetTexture("Interface\\RaidFrame\\UI-RaidFrame-MainAssist")
-	-- 				icon:SetTexCoord(unpack(E.TexCoords))
-	-- 			else
-	-- 				icon:SetTexture("Interface\\WorldStateFrame\\Icons-Classes")
-	-- 				icon:SetTexCoord(value.coords[1] + 0.015, value.coords[2] - 0.02, value.coords[3] + 0.018, value.coords[4] - 0.02)
-	-- 			end
-	-- 			icon:SetWidth(20)
-	-- 			icon:SetHeight(20)
-	-- 			E:FontTemplate(count, nil, 12, "OUTLINE")
-	-- 		end
-	-- 	end
-	-- end)
-
 	local function skinPulloutFrames()
 		for i = 1, NUM_RAID_PULLOUT_FRAMES do
 			local rp = _G["RaidPullout" .. i]
@@ -124,6 +89,19 @@ function LoadSkin()
 			end
 		end
 	end)
+
+	-- ReadyCheckFrame
+	E:StripTextures(ReadyCheckFrame)
+	E:SetTemplate(ReadyCheckFrame, "Transparent")
+
+	E:Kill(ReadyCheckPortrait)
+
+	S:HandleButton(ReadyCheckFrameYesButton)
+	S:HandleButton(ReadyCheckFrameNoButton)
+
+	ReadyCheckFrameYesButton:SetPoint("RIGHT", ReadyCheckFrame, "CENTER", -1, 0)
+	ReadyCheckFrameNoButton:SetPoint("LEFT", ReadyCheckFrameYesButton, "RIGHT", 3, 0)
+	ReadyCheckFrameText:SetPoint("TOP", ReadyCheckFrame, "TOP", 0, -18)
 end
 
 S:AddCallbackForAddon("Blizzard_RaidUI", "RaidUI", LoadSkin)
\ No newline at end of file