fixing WA skins

blooblahguy · Feb 2, 2019 · ce5024c · ce5024c
1 parent 654aa9f
commit ce5024c
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 16 deletions.
diff --git a/core/config_defaults.lua b/core/config_defaults.lua
@@ -859,17 +859,13 @@ shared:Register("border", "bdShadow", bdCore.media.shadow)
 	}}
 	bdCore.general[#bdCore.general+1] = {forcescale = {
 		type = "checkbox",
-		value = false,
+		value = true,
 		label = "Force UI scale for pixel perfect borders",
 	}}
 
 ----------------------------------------
 -- skinning
 ----------------------------------------
-	bdCore.general[#bdCore.general+1] = {tab = {
-		type = "tab",
-		value = "Skinning"
-	}}
 	bdCore.general[#bdCore.general+1] = {skingmotd = {
 		type = "checkbox",
 		value = true,
@@ -880,11 +876,11 @@ shared:Register("border", "bdShadow", bdCore.media.shadow)
 		value = false,
 		label = "Skin Weak Auras to bd Style",
 	}}
-	bdCore.general[#bdCore.general+1] = {fancymenu = {
-		type = "checkbox",
-		value = false,
-		label = "Replace Game Menu with Fancy Menu",
-	}}
+	-- bdCore.general[#bdCore.general+1] = {fancymenu = {
+	-- 	type = "checkbox",
+	-- 	value = false,
+	-- 	label = "Replace Game Menu with Fancy Menu",
+	-- }}
 
 ----------------------------------------
 -- viewports

diff --git a/core/media_functions.lua b/core/media_functions.lua
@@ -159,13 +159,15 @@ function bdCore:setBackdrop(frame,resize)
 	frame.background:SetAllPoints(frame)
 	frame.background:SetVertexColor(unpack(bdCore.media.backdrop))
 	frame.background.protected = true
+	frame.background.SetFrameLevel = bdCore.noop
 
 	frame.border = frame:CreateTexture(nil, "BACKGROUND", nil, -8)
 	frame.border:SetTexture(bdCore.media.flat)
 	frame.border:SetPoint("TOPLEFT", frame, "TOPLEFT", -2, 2)
 	frame.border:SetPoint("BOTTOMRIGHT", frame, "BOTTOMRIGHT", 2, -2)
 	-- frame.border:SetScale(scale)
 	frame.border:SetVertexColor(unpack(bdCore.media.border))
+	frame.border.SetFrameLevel = bdCore.noop
 	frame.border.protected = true
 
 	if (resize ~= false) then

diff --git a/core/moving_functions.lua b/core/moving_functions.lua
@@ -241,6 +241,7 @@ function bdCore:makeMovable(frame, resize, rename)
 
 	Mover.controls = CreateFrame("frame", nil, Mover)
 	local cont = Mover.controls
+	cont:SetFrameStrata("TOOLTIP")
 	cont:SetSize(150, 25)
 	cont:Hide()
 

diff --git a/skinning/weakauras_skin.lua b/skinning/weakauras_skin.lua
@@ -15,14 +15,19 @@ wa_skin:SetScript("OnEvent", function(self, event,addon)
 			frame:SetBackdropBorderColor(0,0,0,1)
 		end--]]
 
+		-- print(frame)
+
+
 		if frame.icon then
 			frame.icon:SetTexCoord(0.1, 0.9, 0.1, 0.9)
 			frame.icon.SetTexCoord = function() return end
 			if frame.border and not frame.bar then
 				frame.border:Hide()
 			end
+
 		end
 
+		bdCore:setBackdrop(frame)
 		--[[
 		if frame.bar then
 			if (frame.bar.fg:GetTexture()) then
@@ -66,13 +71,12 @@ wa_skin:SetScript("OnEvent", function(self, event,addon)
 		end
 	end
 
-	if (WeakAuras) then
+	if (WeakAurasFrame) then
+		if (not c.persistent.bdAddons.skinwas) then return end
 		for weakAura, v in pairs(WeakAuras.regions) do
-			if (c.persistent.skinwas) then
-				if (WeakAuras.regions[weakAura].regionType == "icon" or WeakAuras.regions[weakAura].regionType == "aurabar") then
-					--print(WeakAuras.regions[weakAura].region)
-					Skin_WeakAuras(WeakAuras.regions[weakAura].region)
-				end
+			if (WeakAuras.regions[weakAura].regionType == "icon" or WeakAuras.regions[weakAura].regionType == "aurabar") then
+				--print(WeakAuras.regions[weakAura].region)
+				Skin_WeakAuras(WeakAuras.regions[weakAura].region)
 			end
 		end
 	end