From 1b74fb6f00d3e50cf6c3b0284eeaa08090b45fc3 Mon Sep 17 00:00:00 2001 From: Crum Date: Thu, 12 Jul 2018 16:46:12 -0500 Subject: [PATCH] update auctionhouse skin and clean --- ElvUI/Modules/Skins/Blizzard/AuctionHouse.lua | 47 +++++++++---------- ElvUI/Modules/Skins/Blizzard/Mail.lua | 6 ++- 2 files changed, 27 insertions(+), 26 deletions(-) diff --git a/ElvUI/Modules/Skins/Blizzard/AuctionHouse.lua b/ElvUI/Modules/Skins/Blizzard/AuctionHouse.lua index e61f622..587cafb 100644 --- a/ElvUI/Modules/Skins/Blizzard/AuctionHouse.lua +++ b/ElvUI/Modules/Skins/Blizzard/AuctionHouse.lua @@ -4,9 +4,11 @@ local S = E:GetModule("Skins"); --Cache global variables --Lua functions local _G = _G -local unpack = unpack -local pairs = pairs +local pairs, unpack = pairs, unpack --WoW API / Variables +local CreateFrame = CreateFrame +local GetAuctionSellItemInfo = GetAuctionSellItemInfo +local GetItemInfoByName = GetItemInfoByName local hooksecurefunc = hooksecurefunc local function LoadSkin() @@ -94,18 +96,19 @@ local function LoadSkin() if event == "NEW_AUCTION_UPDATE" and this:GetNormalTexture() then this:GetNormalTexture():SetTexCoord(unpack(E.TexCoords)) E:SetInside(this:GetNormalTexture()) - end - local itemName = GetAuctionSellItemInfo() - if itemName then - local _, itemString = GetItemInfoByName(itemName) - local _, _, quality = GetItemInfo(itemString, "item:(%d+)") - if quality then - AuctionsItemButton:SetBackdropBorderColor(GetItemQualityColor(quality)) - AuctionsItemButtonName:SetTextColor(GetItemQualityColor(quality)) - else - AuctionsItemButton:SetBackdropBorderColor(unpack(E["media"].bordercolor)) + local itemName = GetAuctionSellItemInfo() + if itemName then + local _, _, quality = GetItemInfoByName(itemName) + + if quality then + this:SetBackdropBorderColor(GetItemQualityColor(quality)) + else + this:SetBackdropBorderColor(unpack(E["media"].bordercolor)) + end end + else + this:SetBackdropBorderColor(unpack(E["media"].bordercolor)) end end) @@ -215,17 +218,15 @@ local function LoadSkin() E:SetTemplate(icon, "Default") hooksecurefunc(name, "SetVertexColor", function(_, r, g, b) - if r and g and b then - icon:SetBackdropBorderColor(r, g, b) - end + icon:SetBackdropBorderColor(r, g, b) end) - hooksecurefunc(name, "Hide", function(_, r, g, b) + hooksecurefunc(name, "Hide", function() icon:SetBackdropBorderColor(unpack(E["media"].bordercolor)) end) end E:StripTextures(button) - E:StyleButton(button, false, true) + E:StyleButton(button, nil, true) _G["BrowseButton"..i.."Highlight"] = button:GetHighlightTexture() button:GetHighlightTexture():ClearAllPoints() E:Point(button:GetHighlightTexture(), "TOPLEFT", icon, "TOPRIGHT", 2, 0) @@ -250,9 +251,7 @@ local function LoadSkin() E:SetTemplate(icon, "Default") hooksecurefunc(name, "SetVertexColor", function(_, r, g, b) - if r and g and b then - icon:SetBackdropBorderColor(r, g, b) - end + icon:SetBackdropBorderColor(r, g, b) end) hooksecurefunc(name, "Hide", function(_, r, g, b) icon:SetBackdropBorderColor(unpack(E["media"].bordercolor)) @@ -260,7 +259,7 @@ local function LoadSkin() end E:StripTextures(button) - E:StyleButton(button, false, true) + E:StyleButton(button, nil, true) _G["AuctionsButton"..i.."Highlight"] = button:GetHighlightTexture() button:GetHighlightTexture():ClearAllPoints() E:Point(button:GetHighlightTexture(), "TOPLEFT", icon, "TOPRIGHT", 2, 0) @@ -285,9 +284,7 @@ local function LoadSkin() E:SetTemplate(icon, "Default") hooksecurefunc(name, "SetVertexColor", function(_, r, g, b) - if r and g and b then - icon:SetBackdropBorderColor(r, g, b) - end + icon:SetBackdropBorderColor(r, g, b) end) hooksecurefunc(name, "Hide", function(_, r, g, b) icon:SetBackdropBorderColor(unpack(E["media"].bordercolor)) @@ -295,7 +292,7 @@ local function LoadSkin() end E:StripTextures(button) - E:StyleButton(button, false, true) + E:StyleButton(button, nil, true) _G["BidButton"..i.."Highlight"] = button:GetHighlightTexture() button:GetHighlightTexture():ClearAllPoints() E:Point(button:GetHighlightTexture(), "TOPLEFT", icon, "TOPRIGHT", 2, 0) diff --git a/ElvUI/Modules/Skins/Blizzard/Mail.lua b/ElvUI/Modules/Skins/Blizzard/Mail.lua index ee0eb81..83fe564 100644 --- a/ElvUI/Modules/Skins/Blizzard/Mail.lua +++ b/ElvUI/Modules/Skins/Blizzard/Mail.lua @@ -4,13 +4,17 @@ local S = E:GetModule("Skins"); --Cache global variables --Lua functions local _G = _G -local unpack = unpack +local iapirs, unpack = ipairs, unpack --WoW API / Variables +local GetInboxHeaderInfo = GetInboxHeaderInfo local GetInboxItem = GetInboxItem +local GetInboxNumItems = GetInboxNumItems local GetItemInfo = GetItemInfo +local GetItemInfoByName = GetItemInfoByName local GetItemQualityColor = GetItemQualityColor local GetSendMailItem = GetSendMailItem local hooksecurefunc = hooksecurefunc + local INBOXITEMS_TO_DISPLAY = INBOXITEMS_TO_DISPLAY local function LoadSkin()