update Bags

This commit is contained in:
Crum
2017-12-20 01:05:13 -06:00
parent d3ff4aa8be
commit 21775bf505
2 changed files with 7 additions and 8 deletions
+7 -8
View File
@@ -1,7 +1,7 @@
local E, L, V, P, G = unpack(ElvUI) local E, L, V, P, G = unpack(ElvUI)
local B = E:NewModule("Bags", "AceHook-3.0", "AceEvent-3.0", "AceTimer-3.0") local B = E:NewModule("Bags", "AceHook-3.0", "AceEvent-3.0", "AceTimer-3.0")
local Search = LibStub("LibItemSearch-1.2", true) local Search = LibStub("LibItemSearch-1.2", true)
local LIP = LibStub("ItemPrice-1.1", true) -- local LIP = LibStub("ItemPrice-1.1", true)
--Cache global variables --Cache global variables
--Lua functions --Lua functions
@@ -168,7 +168,7 @@ function B:SetSearch(query)
for slotID = 1, GetContainerNumSlots(bagID) do for slotID = 1, GetContainerNumSlots(bagID) do
local link = GetContainerItemLink(bagID, slotID) local link = GetContainerItemLink(bagID, slotID)
local button = bagFrame.Bags[bagID][slotID] local button = bagFrame.Bags[bagID][slotID]
local success, result = pcall(Search.Matches, Search, link, query) -- local success, result = pcall(Search.Matches, Search, link, query)
if(empty or (success and result)) then if(empty or (success and result)) then
SetItemButtonDesaturated(button) SetItemButtonDesaturated(button)
button:SetAlpha(1) button:SetAlpha(1)
@@ -185,7 +185,7 @@ function B:SetSearch(query)
for slotID = 1, numKey do for slotID = 1, numKey do
local link = GetContainerItemLink(KEYRING_CONTAINER, slotID) local link = GetContainerItemLink(KEYRING_CONTAINER, slotID)
local button = _G["ElvUIKeyFrameItem"..slotID] local button = _G["ElvUIKeyFrameItem"..slotID]
local success, result = pcall(Search.Matches, Search, link, query) -- local success, result = pcall(Search.Matches, Search, link, query)
if(empty or (success and result)) then if(empty or (success and result)) then
SetItemButtonDesaturated(button) SetItemButtonDesaturated(button)
button:SetAlpha(1) button:SetAlpha(1)
@@ -460,8 +460,7 @@ function B:Layout(isBank)
f.ContainerHolder:SetHeight(buttonSize + (buttonSpacing * 2)) f.ContainerHolder:SetHeight(buttonSize + (buttonSpacing * 2))
if isBank then if isBank then
BankFrameItemButton_Update(f.ContainerHolder[i]) BankFrameItemButton_OnUpdate(f.ContainerHolder[i])
BankFrameItemButton_UpdateLocked(f.ContainerHolder[i])
end end
f.ContainerHolder[i]:SetWidth(buttonSize) f.ContainerHolder[i]:SetWidth(buttonSize)
@@ -879,13 +878,13 @@ function B:ContructContainerFrame(name, isBank)
f.sortButton:SetPoint("RIGHT", f.bagText, "LEFT", -5, E.Border * 2) f.sortButton:SetPoint("RIGHT", f.bagText, "LEFT", -5, E.Border * 2)
f.sortButton:SetNormalTexture("Interface\\AddOns\\ElvUI\\media\\textures\\INV_Pet_RatCage") f.sortButton:SetNormalTexture("Interface\\AddOns\\ElvUI\\media\\textures\\INV_Pet_RatCage")
f.sortButton:GetNormalTexture():SetTexCoord(unpack(E.TexCoords)) f.sortButton:GetNormalTexture():SetTexCoord(unpack(E.TexCoords))
f.sortButton:GetNormalTexture():SetInside() E:SetInside(f.sortButton:GetNormalTexture())
f.sortButton:SetPushedTexture("Interface\\AddOns\\ElvUI\\media\\textures\\INV_Pet_RatCage") f.sortButton:SetPushedTexture("Interface\\AddOns\\ElvUI\\media\\textures\\INV_Pet_RatCage")
f.sortButton:GetPushedTexture():SetTexCoord(unpack(E.TexCoords)) f.sortButton:GetPushedTexture():SetTexCoord(unpack(E.TexCoords))
f.sortButton:GetPushedTexture():SetInside() E:SetInside(f.sortButton:GetPushedTexture())
f.sortButton:SetDisabledTexture("Interface\\AddOns\\ElvUI\\media\\textures\\INV_Pet_RatCage") f.sortButton:SetDisabledTexture("Interface\\AddOns\\ElvUI\\media\\textures\\INV_Pet_RatCage")
f.sortButton:GetDisabledTexture():SetTexCoord(unpack(E.TexCoords)) f.sortButton:GetDisabledTexture():SetTexCoord(unpack(E.TexCoords))
f.sortButton:GetDisabledTexture():SetInside() E:SetInside(f.sortButton:GetDisabledTexture())
f.sortButton:GetDisabledTexture():SetDesaturated(true) f.sortButton:GetDisabledTexture():SetDesaturated(true)
E:StyleButton(f.sortButton, nil, true) E:StyleButton(f.sortButton, nil, true)
f.sortButton.ttText = L["Sort Bags"] f.sortButton.ttText = L["Sort Bags"]