From 2e26b39fb0409038e9fd3c081d275966f1756773 Mon Sep 17 00:00:00 2001 From: Crum Date: Thu, 25 Jan 2018 13:06:22 -0600 Subject: [PATCH] update skins --- .../Modules/Skins/Blizzard/AuctionHouse.lua | 4 ++- .../6/7/ElvUI/Modules/Skins/Blizzard/Mail.lua | 17 +++++++----- .../ElvUI/Modules/Skins/Blizzard/Merchant.lua | 26 ++++++------------- 3 files changed, 22 insertions(+), 25 deletions(-) diff --git a/2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/AuctionHouse.lua b/2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/AuctionHouse.lua index c2fc49b..1d0b3b3 100644 --- a/2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/AuctionHouse.lua +++ b/2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/AuctionHouse.lua @@ -96,8 +96,10 @@ local function LoadSkin() E:SetInside(this:GetNormalTexture()) end - local itemName, _, _, quality = GetAuctionSellItemInfo() + 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)) diff --git a/2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/Mail.lua b/2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/Mail.lua index 9a61ecb..ab144f3 100644 --- a/2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/Mail.lua +++ b/2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/Mail.lua @@ -51,11 +51,15 @@ local function LoadSkin() button:SetBackdropBorderColor(unpack(E["media"].bordercolor)) if packageIcon and not isGM then - local _, _, _, quality = GetInboxItem(index) - if quality then - button:SetBackdropBorderColor(GetItemQualityColor(quality)) - else - button:SetBackdropBorderColor(unpack(E["media"].bordercolor)) + local itemName = GetInboxItem(index) + if itemName then + local _, itemString = GetItemInfoByName(itemName) + local _, _, quality = GetItemInfo(itemString, "item:(%d+)") + if quality then + button:SetBackdropBorderColor(GetItemQualityColor(quality)) + else + button:SetBackdropBorderColor(unpack(E["media"].bordercolor)) + end end elseif isGM then button:SetBackdropBorderColor(0, 0.56, 0.94) @@ -165,7 +169,8 @@ local function LoadSkin() if hasItem then local itemName = GetInboxItem(index) if itemName then - local _, _, _, quality = GetInboxItem(index) + local _, itemString = GetItemInfoByName(itemName) + local _, _, quality = GetItemInfo(itemString, "item:(%d+)") if quality then OpenMailPackageButton:SetBackdropBorderColor(GetItemQualityColor(quality)) else diff --git a/2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/Merchant.lua b/2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/Merchant.lua index 355dee8..aae9be9 100644 --- a/2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/Merchant.lua +++ b/2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/Merchant.lua @@ -115,15 +115,10 @@ local function LoadSkin() local buybackName = GetBuybackItemInfo(GetNumBuybackItems()) if buybackName then - local itemLink = GetItemLinkByName(buybackName) - if itemLink then - local _, _, quality = GetItemInfo(match(itemLink, "item:(%d+)")) - if quality then - MerchantBuyBackItemName:SetTextColor(GetItemQualityColor(quality)) - MerchantBuyBackItemItemButton:SetBackdropBorderColor(GetItemQualityColor(quality)) - else - MerchantBuyBackItemItemButton:SetBackdropBorderColor(unpack(E["media"].bordercolor)) - end + local _, _, quality = GetItemInfoByName(buybackName) + if quality then + MerchantBuyBackItemName:SetTextColor(GetItemQualityColor(quality)) + MerchantBuyBackItemItemButton:SetBackdropBorderColor(GetItemQualityColor(quality)) else MerchantBuyBackItemItemButton:SetBackdropBorderColor(unpack(E["media"].bordercolor)) end @@ -140,15 +135,10 @@ local function LoadSkin() if i <= numBuybackItems then local buybackName = GetBuybackItemInfo(i) if buybackName then - local itemLink = GetItemLinkByName(buybackName) - if itemLink then - local _, _, quality = GetItemInfo(match(itemLink, "item:(%d+)")) - if quality then - itemName:SetTextColor(GetItemQualityColor(quality)) - itemButton:SetBackdropBorderColor(GetItemQualityColor(quality)) - else - itemButton:SetBackdropBorderColor(unpack(E["media"].bordercolor)) - end + local _, _, quality = GetItemInfoByName(buybackName) + if quality then + itemName:SetTextColor(GetItemQualityColor(quality)) + itemButton:SetBackdropBorderColor(GetItemQualityColor(quality)) else itemButton:SetBackdropBorderColor(unpack(E["media"].bordercolor)) end