Remove enchant search, fix lua error with elvui
This commit is contained in:
+1
-1
@@ -4,7 +4,7 @@
|
|||||||
## Notes: Single window displays for your inventory, bank, and keys
|
## Notes: Single window displays for your inventory, bank, and keys
|
||||||
## SavedVariables: BagnonGlobalSettings
|
## SavedVariables: BagnonGlobalSettings
|
||||||
## SavedVariablesPerCharacter: BagnonFrameSettings
|
## SavedVariablesPerCharacter: BagnonFrameSettings
|
||||||
## Version: 2.13.3
|
## Version: 2.13.4
|
||||||
## OptionalDeps: Ace3, Bagnon_Armory, LibItemSearch
|
## OptionalDeps: Ace3, Bagnon_Armory, LibItemSearch
|
||||||
embeds.xml
|
embeds.xml
|
||||||
localization.xml
|
localization.xml
|
||||||
|
|||||||
+13
-43
@@ -294,38 +294,24 @@ end
|
|||||||
|
|
||||||
--item slot color
|
--item slot color
|
||||||
function ItemSlot:UpdateSlotColor()
|
function ItemSlot:UpdateSlotColor()
|
||||||
|
local normalTexture = self:GetNormalTexture() -- elvui nukes this function (in a bad way)
|
||||||
|
local r, g, b = 1, 1, 1
|
||||||
if (not self:GetItem()) and self:ColoringBagSlots() then
|
if (not self:GetItem()) and self:ColoringBagSlots() then
|
||||||
if self:IsKeyRingSlot() then
|
if self:IsKeyRingSlot() then
|
||||||
local r, g, b = self:GetKeyringSlotColor()
|
r, g, b = self:GetKeyringSlotColor()
|
||||||
SetItemButtonTextureVertexColor(self, r, g, b)
|
elseif self:IsAmmoBagSlot() then
|
||||||
self:GetNormalTexture():SetVertexColor(r, g, b)
|
r, g, b = self:GetAmmoSlotColor()
|
||||||
return
|
elseif self:IsTradeBagSlot() then
|
||||||
end
|
r, g, b = self:GetTradeSlotColor()
|
||||||
|
elseif self:IsShardBagSlot() then
|
||||||
if self:IsAmmoBagSlot() then
|
r, g, b = self:GetShardSlotColor()
|
||||||
local r, g, b = self:GetAmmoSlotColor()
|
|
||||||
SetItemButtonTextureVertexColor(self, r, g, b)
|
|
||||||
self:GetNormalTexture():SetVertexColor(r, g, b)
|
|
||||||
return
|
|
||||||
end
|
|
||||||
|
|
||||||
if self:IsTradeBagSlot() then
|
|
||||||
local r, g, b = self:GetTradeSlotColor()
|
|
||||||
SetItemButtonTextureVertexColor(self, r, g, b)
|
|
||||||
self:GetNormalTexture():SetVertexColor(r, g, b)
|
|
||||||
return
|
|
||||||
end
|
|
||||||
|
|
||||||
if self:IsShardBagSlot() then
|
|
||||||
local r, g, b = self:GetShardSlotColor()
|
|
||||||
SetItemButtonTextureVertexColor(self, r, g, b)
|
|
||||||
self:GetNormalTexture():SetVertexColor(r, g, b)
|
|
||||||
return
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
SetItemButtonTextureVertexColor(self, 1, 1, 1)
|
SetItemButtonTextureVertexColor(self, r, g, b)
|
||||||
self:GetNormalTexture():SetVertexColor(1, 1, 1)
|
if normalTexture then
|
||||||
|
normalTexture:SetVertexColor(r, g, b)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
--item count
|
--item count
|
||||||
@@ -343,20 +329,7 @@ function ItemSlot:SetLocked(locked)
|
|||||||
SetItemButtonDesaturated(self, locked)
|
SetItemButtonDesaturated(self, locked)
|
||||||
end
|
end
|
||||||
|
|
||||||
function ItemSlot:UpdateMEName()
|
|
||||||
local itemLink = self:GetItem()
|
|
||||||
if itemLink then
|
|
||||||
self.MEName = strlower(GetREData(GetREInSlot(self:GetBag(), self:GetID()))['spellName'])
|
|
||||||
return
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
function ItemSlot:UpdateLocked()
|
function ItemSlot:UpdateLocked()
|
||||||
if self:IsLocked() then
|
|
||||||
self.MEName = ""
|
|
||||||
else
|
|
||||||
self:UpdateMEName()
|
|
||||||
end
|
|
||||||
self:SetLocked(self:IsLocked())
|
self:SetLocked(self:IsLocked())
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -469,9 +442,6 @@ function ItemSlot:UpdateSearch()
|
|||||||
if search and search ~= '' then
|
if search and search ~= '' then
|
||||||
local itemLink = self:GetItem()
|
local itemLink = self:GetItem()
|
||||||
shouldFade = not (itemLink and (ItemSearch:Find(itemLink, search)))
|
shouldFade = not (itemLink and (ItemSearch:Find(itemLink, search)))
|
||||||
if self.MEName and string.find(self.MEName, string.lower(search)) then
|
|
||||||
shouldFade = false
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
if shouldFade then
|
if shouldFade then
|
||||||
|
|||||||
@@ -260,20 +260,7 @@ function ItemSlot:SetLocked(locked)
|
|||||||
SetItemButtonDesaturated(self, locked, 0.5, 0.5, 0.5)
|
SetItemButtonDesaturated(self, locked, 0.5, 0.5, 0.5)
|
||||||
end
|
end
|
||||||
|
|
||||||
function ItemSlot:UpdateMEName()
|
|
||||||
local itemLink = self:GetItem()
|
|
||||||
if itemLink then
|
|
||||||
self.MEName = strlower(GetREData(GetGuildBankItemMysticEnchant(self:GetSlot()))['spellName'])
|
|
||||||
return
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
function ItemSlot:UpdateLocked()
|
function ItemSlot:UpdateLocked()
|
||||||
if self:IsLocked() then
|
|
||||||
self.MEName = ""
|
|
||||||
else
|
|
||||||
self:UpdateMEName()
|
|
||||||
end
|
|
||||||
self:SetLocked(self:IsLocked())
|
self:SetLocked(self:IsLocked())
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -357,9 +344,6 @@ function ItemSlot:UpdateSearch()
|
|||||||
if search and search ~= '' then
|
if search and search ~= '' then
|
||||||
local itemLink = self:GetItem()
|
local itemLink = self:GetItem()
|
||||||
shouldFade = not (itemLink and ItemSearch:Find(itemLink, search))
|
shouldFade = not (itemLink and ItemSearch:Find(itemLink, search))
|
||||||
if self.MEName and string.find(self.MEName, string.lower(search)) then
|
|
||||||
shouldFade = false
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
if shouldFade then
|
if shouldFade then
|
||||||
|
|||||||
Reference in New Issue
Block a user