Takika/MyBags
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Core fixes for 6.0.2

Browse Source
This commit is contained in:
Sandor Takacs
2014-10-21 18:07:13 +02:00
parent 232f424a6f
commit 2b8a6af9e2
1 changed files with 49 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
MyBagsCore/MyBags.lua
View File

@ -1,5 +1,5 @@
local MBC = "MyBagsCore-1.0" local MBC = "MyBagsCore-1.0"
local MBC_MINOR = "2014.02.11.3" local MBC_MINOR = "2014.10.21.1"
if not LibStub then error(MBC .. " requires LibStub.") end if not LibStub then error(MBC .. " requires LibStub.") end
local MyBagsCore = LibStub:NewLibrary(MBC, MBC_MINOR) local MyBagsCore = LibStub:NewLibrary(MBC, MBC_MINOR)
if not MyBagsCore then return end if not MyBagsCore then return end
@ -484,7 +484,7 @@ function MyBagsCore:BagIDToInvSlotID(bag, isBank)
end end
if isBank then if isBank then
return BankButtonIDToInvSlotID(bag, 1) return BankButtonIDToInvSlotID(bag - 4, 1)
end end
return ContainerIDToInventoryID(bag) return ContainerIDToInventoryID(bag)
@ -1355,8 +1355,41 @@ function MyBagsCore:LayoutBagFrame(bagFrame)
self.curRow = self.curRow + 1 self.curRow = self.curRow + 1
end end
local newItemTexture = _G[itemBase .. slot .. "NewItemTexture"] local newItemTexture = _G[itemBase .. slot].NewItemTexture
newItemTexture:Hide() local flash = _G[itemBase .. slot].flashAnim;
local newItemAnim = _G[itemBase .. slot].newitemglowAnim;
local isNewItem = C_NewItems.IsNewItem(bagFrame:GetID(), itemButton:GetID())
local isBattlePayItem = IsBattlePayItem(bagFrame:GetID(), itemButton:GetID())
local battlepayItemTexture = _G[itemBase .. slot].BattlepayItemTexture;
battlepayItemTexture:Hide();
if (isNewItem) then
if (isBattlePayItem) then
newItemTexture:Hide();
battlepayItemTexture:Show();
else
if (quality and NEW_ITEM_ATLAS_BY_QUALITY[quality]) then
newItemTexture:SetAtlas(NEW_ITEM_ATLAS_BY_QUALITY[quality]);
else
newItemTexture:SetAtlas("bags-glow-white");
end
battlepayItemTexture:Hide();
newItemTexture:Show();
end
if (not flash:IsPlaying() and not newItemAnim:IsPlaying()) then
flash:Play();
newItemAnim:Play();
end
else
battlepayItemTexture:Hide();
newItemTexture:Hide();
if (flash:IsPlaying() or newItemAnim:IsPlaying()) then
flash:Stop();
newItemAnim:Stop();
end
end
itemButton:Show() itemButton:Show()
itemButton:ClearAllPoints() itemButton:ClearAllPoints()
itemButton:SetPoint("TOPLEFT", self.frame:GetName(), "TOPLEFT", self:GetXY(self.curRow, self.curCol)) itemButton:SetPoint("TOPLEFT", self.frame:GetName(), "TOPLEFT", self:GetXY(self.curRow, self.curCol))
@ -1487,10 +1520,12 @@ function MyBagsCore:LayoutFrameOnEvent(event, unit)
return return
end end
if self.isLive then if event == "BAG_UPDATE_COOLDOWN" then
if unit == "player" and self.isLive then
self:LayoutFrame() self:LayoutFrame()
end end
end end
end
function MyBagsCore:LockButton_OnClick() function MyBagsCore:LockButton_OnClick()
self.TogOpt("Lock") self.TogOpt("Lock")