shaga/AtlasLoot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

performance friendly icon borders, get rid of redundant parameter to AtlasLoot_ShowItemsFrame

Browse Source
This commit is contained in:
Spit
2025-10-04 18:47:30 +03:00
parent 474aff3bb2
commit 6ae3ca33f4
7 changed files with 112 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AtlasLoot.toc
+1 -1
View File
@@ -3,7 +3,7 @@
## Notes: Shows possible loot from dungeon bosses and other sources. ## Notes: Shows possible loot from dungeon bosses and other sources.
## Author: Otari (overhaul/revamp, menu changes, bugfixes/updates), Lexie (Turtle WoW fixes/updates), Pepopo, MarcelineVQ (Kara40 loot), Shagu ## Author: Otari (overhaul/revamp, menu changes, bugfixes/updates), Lexie (Turtle WoW fixes/updates), Pepopo, MarcelineVQ (Kara40 loot), Shagu
## LegacyAuthor: Daviesh, Pompa (Turtle WoW World Bosses), Xerron (Turtle WoW World Bosses), Gurky (Turtle WoW 1.16/1.16.1 Dungeons) ## LegacyAuthor: Daviesh, Pompa (Turtle WoW World Bosses), Xerron (Turtle WoW World Bosses), Gurky (Turtle WoW 1.16/1.16.1 Dungeons)
## Version: 3.2.7 ## Version: 3.2.8
## SavedVariablesPerCharacter: AtlasLootCharDB ## SavedVariablesPerCharacter: AtlasLootCharDB
## OptionalDeps: Alphamap, AtlasLoader, LootLink, ItemSync, HewdropLib, Ace2, EquipCompare, EQCompare ## OptionalDeps: Alphamap, AtlasLoader, LootLink, ItemSync, HewdropLib, Ace2, EquipCompare, EQCompare
Core/AtlasLoot.lua
+54 -69
View File
@@ -52,7 +52,7 @@ local ATLAS_LOOT_BOSS_LINES = 24;
local Anchor_Atlas = { "TOPLEFT", "AtlasFrame", "TOPLEFT", 18, -84 } local Anchor_Atlas = { "TOPLEFT", "AtlasFrame", "TOPLEFT", 18, -84 }
local Anchor_AlphaMap = { "TOPLEFT", "AlphaMapAlphaMapFrame", "TOPLEFT", 0, 0 } local Anchor_AlphaMap = { "TOPLEFT", "AlphaMapAlphaMapFrame", "TOPLEFT", 0, 0 }
local Anchor_Default = { "TOPLEFT", "AtlasLootDefaultFrame_LootBackground", "TOPLEFT", 2, -2 } local Anchor_Default = { "TOPLEFT", "AtlasLootDefaultFrame", "TOPLEFT", 45, -85 }
-- Variables to hold hooked Atlas functions -- Variables to hold hooked Atlas functions
Hooked_Atlas_Refresh = nil; Hooked_Atlas_Refresh = nil;
@@ -137,9 +137,9 @@ function AtlasLootDefaultFrame_OnShow()
return return
end end
if ( AtlasLootItemsFrame.refresh ) then if ( AtlasLootItemsFrame.refresh ) then
AtlasLoot_ShowBossLoot(AtlasLootItemsFrame.refresh[1], AtlasLootItemsFrame.refresh[3], AtlasLoot_AnchorPoint) AtlasLoot_ShowBossLoot(AtlasLootItemsFrame.refresh[1], AtlasLootItemsFrame.refresh[3])
else else
AtlasLoot_ShowBossLoot(AtlasLootCharDB.LastBoss, AtlasLootCharDB.LastBossText, AtlasLoot_AnchorPoint); AtlasLoot_ShowBossLoot(AtlasLootCharDB.LastBoss, AtlasLootCharDB.LastBossText);
end end
end end
@@ -415,10 +415,14 @@ function AtlasLoot_SetupForAtlas()
AtlasLootInfo:ClearAllPoints(); AtlasLootInfo:ClearAllPoints();
AtlasLootInfo:SetParent(AtlasFrame); AtlasLootInfo:SetParent(AtlasFrame);
AtlasLootInfo:SetPoint("TOPLEFT", "AtlasFrame", "TOPLEFT", 546, -3); AtlasLootInfo:SetPoint("TOPLEFT", "AtlasFrame", "TOPLEFT", 546, -3);
AtlasLootInfo:SetFrameLevel(AtlasFrame:GetFrameLevel() + 1)
AtlasLootInfo:Show()
-- Anchor the bottom panel to the Atlas frame -- Anchor the bottom panel to the Atlas frame
AtlasLootPanel:ClearAllPoints(); AtlasLootPanel:ClearAllPoints();
AtlasLootPanel:SetParent(AtlasFrame); AtlasLootPanel:SetParent(AtlasFrame);
AtlasLootPanel:SetPoint("TOP", "AtlasFrame", "BOTTOM", 0, 9); AtlasLootPanel:SetPoint("TOP", "AtlasFrame", "BOTTOM", 0, 9);
AtlasLootPanel:SetFrameLevel(AtlasFrame:GetFrameLevel() + 1)
AtlasLootPanel:Show()
AtlasLoot_AnchorPoint = Anchor_Atlas AtlasLoot_AnchorPoint = Anchor_Atlas
AtlasLootItemsFrame:Hide(); AtlasLootItemsFrame:Hide();
end end
@@ -722,7 +726,7 @@ function AtlasLootBoss_OnClick(name)
_G[name.."_Selected"]:Show(); _G[name.."_Selected"]:Show();
_G[name.."_Loot"]:Hide(); _G[name.."_Loot"]:Hide();
local _,_,boss = string.find(_G[name.."_Text"]:GetText(), "|c%x%x%x%x%x%x%x%x%s*[%dX']*[%) ]*(.*[^%,])[%,]?$"); local _,_,boss = string.find(_G[name.."_Text"]:GetText(), "|c%x%x%x%x%x%x%x%x%s*[%dX']*[%) ]*(.*[^%,])[%,]?$");
AtlasLoot_ShowBossLoot(AtlasLootBossButtons[zoneID][id], boss, AtlasFrame); AtlasLoot_ShowBossLoot(AtlasLootBossButtons[zoneID][id], boss);
AtlasLootItemsFrame.activeBoss = id; AtlasLootItemsFrame.activeBoss = id;
AtlasLoot_AtlasScrollBar_Update(); AtlasLoot_AtlasScrollBar_Update();
AtlasLootCharDB.LastBoss = AtlasLootBossButtons[zoneID][id] AtlasLootCharDB.LastBoss = AtlasLootBossButtons[zoneID][id]
@@ -739,7 +743,7 @@ function AtlasLootBoss_OnClick(name)
_G[name.."_Selected"]:Show(); _G[name.."_Selected"]:Show();
_G[name.."_Loot"]:Hide(); _G[name.."_Loot"]:Hide();
local _,_,boss = string.find(_G[name.."_Text"]:GetText(), "|c%x%x%x%x%x%x%x%x%s*[%dX]*[%) ]*(.*[^%,])[%,]?$"); local _,_,boss = string.find(_G[name.."_Text"]:GetText(), "|c%x%x%x%x%x%x%x%x%s*[%dX]*[%) ]*(.*[^%,])[%,]?$");
AtlasLoot_ShowBossLoot(AtlasLootWBBossButtons[zoneID][id], boss, AtlasFrame); AtlasLoot_ShowBossLoot(AtlasLootWBBossButtons[zoneID][id], boss);
AtlasLootItemsFrame.activeBoss = id; AtlasLootItemsFrame.activeBoss = id;
AtlasLoot_AtlasScrollBar_Update(); AtlasLoot_AtlasScrollBar_Update();
AtlasLootCharDB.LastBoss = AtlasLootWBBossButtons[zoneID][id] AtlasLootCharDB.LastBoss = AtlasLootWBBossButtons[zoneID][id]
@@ -753,7 +757,7 @@ function AtlasLootBoss_OnClick(name)
_G[name.."_Selected"]:Show(); _G[name.."_Selected"]:Show();
_G[name.."_Loot"]:Hide(); _G[name.."_Loot"]:Hide();
local _,_,boss = string.find(_G[name.."_Text"]:GetText(), "|c%x%x%x%x%x%x%x%x%s*[%wX]*[%) ]*(.*[^%,])[%,]?$"); local _,_,boss = string.find(_G[name.."_Text"]:GetText(), "|c%x%x%x%x%x%x%x%x%s*[%wX]*[%) ]*(.*[^%,])[%,]?$");
AtlasLoot_ShowBossLoot(AtlasLootBattlegrounds[zoneID][id], boss, AtlasFrame); AtlasLoot_ShowBossLoot(AtlasLootBattlegrounds[zoneID][id], boss);
AtlasLootItemsFrame.activeBoss = id; AtlasLootItemsFrame.activeBoss = id;
AtlasLoot_AtlasScrollBar_Update(); AtlasLoot_AtlasScrollBar_Update();
AtlasLootCharDB.LastBoss = AtlasLootBattlegrounds[zoneID][id] AtlasLootCharDB.LastBoss = AtlasLootBattlegrounds[zoneID][id]
@@ -764,7 +768,7 @@ function AtlasLootBoss_OnClick(name)
AtlasLootItemsFrame.externalBoss = nil; AtlasLootItemsFrame.externalBoss = nil;
-- Hide the AtlasQuest frame if present so that the AtlasLoot items frame is not stuck under it -- Hide the AtlasQuest frame if present so that the AtlasLoot items frame is not stuck under it
if ( AtlasQuestInsideFrame ) then if ( AtlasQuestInsideFrame ) then
HideUIPanel(AtlasQuestInsideFrame); AtlasQuestInsideFrame:Hide();
end end
end end
@@ -967,8 +971,8 @@ function AtlasLootItemsFrame_OnUpdate()
for k in pairs(this.queue) do for k in pairs(this.queue) do
this.queue[k] = nil this.queue[k] = nil
end end
if ( this.refresh and this.refresh[1] and this.refresh[2] and this.refresh[3] and this.refresh[4] ) then if ( this.refresh and this.refresh[1] and this.refresh[2] and this.refresh[3] ) then
AtlasLoot_ShowItemsFrame(this.refresh[1], this.refresh[2], this.refresh[3], this.refresh[4]) AtlasLoot_ShowItemsFrame(this.refresh[1], this.refresh[2], this.refresh[3])
end end
end end
end end
@@ -982,7 +986,7 @@ pFrame - Data structure describing how and where to anchor the item frame (more
This fuction is not normally called directly, it is usually invoked by AtlasLoot_ShowBossLoot. This fuction is not normally called directly, it is usually invoked by AtlasLoot_ShowBossLoot.
It is the workhorse of the mod and allows the loot tables to be displayed any way anywhere in any mod. It is the workhorse of the mod and allows the loot tables to be displayed any way anywhere in any mod.
]] ]]
function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame) function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss)
AtlasLootItemsFrame.refreshTime = nil AtlasLootItemsFrame.refreshTime = nil
if ( AtlasLootItemsFrameContainer:IsShown() and AtlasLootItemsFrame.refresh and dataID ~= AtlasLootItemsFrame.refresh[1] ) then if ( AtlasLootItemsFrameContainer:IsShown() and AtlasLootItemsFrame.refresh and dataID ~= AtlasLootItemsFrame.refresh[1] ) then
AtlasLootItemsFrameContainer:Hide() AtlasLootItemsFrameContainer:Hide()
@@ -1028,7 +1032,7 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame)
AtlasQuestInsideFrame:Hide(); AtlasQuestInsideFrame:Hide();
end end
-- Store data about the state of the items frame to allow minor tweaks or a recall of the current loot page -- Store data about the state of the items frame to allow minor tweaks or a recall of the current loot page
AtlasLootItemsFrame.refresh = { dataID, dataSource_backup, boss, pFrame }; AtlasLootItemsFrame.refresh = { dataID, dataSource_backup, boss, AtlasLoot_AnchorPoint };
-- Escape out of this function if creating a menu, this function only handles loot tables. -- Escape out of this function if creating a menu, this function only handles loot tables.
-- Inserting escapes in this way allows consistant calling of data whether it is a loot table or a menu. -- Inserting escapes in this way allows consistant calling of data whether it is a loot table or a menu.
if ( AtlasLoot_MenuList[dataID] ) then if ( AtlasLoot_MenuList[dataID] ) then
@@ -1057,7 +1061,7 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame)
extraFrame = _G["AtlasLootItem_"..i.."_Extra"]; extraFrame = _G["AtlasLootItem_"..i.."_Extra"];
local quantity = _G["AtlasLootItem_"..i.."_Quantity"] local quantity = _G["AtlasLootItem_"..i.."_Quantity"]
local iconBorder = _G["AtlasLootItem_"..i.."_IconBorder"] local iconBorder = _G["AtlasLootItem_"..i.."_IconBorder"]
iconBorder:SetBackdropBorderColor(1, 1, 1) iconBorder:SetVertexColor(1, 1, 1)
if ( string.sub(dataSource[dataID][i][1], 1, 1) == "s" ) then if ( string.sub(dataSource[dataID][i][1], 1, 1) == "s" ) then
isItem = false; isItem = false;
isEnchant = false; isEnchant = false;
@@ -1079,13 +1083,13 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame)
if ( itemName ) then if ( itemName ) then
local r, g, b, itemColor = GetItemQualityColor(itemQuality); local r, g, b, itemColor = GetItemQualityColor(itemQuality);
text = itemColor..itemName; text = itemColor..itemName;
iconBorder:SetBackdropBorderColor(r, g, b) iconBorder:SetVertexColor(r, g, b)
else else
if ( itemID and itemID ~= 0 ) then if ( itemID and itemID ~= 0 ) then
AtlasLootCacheTooltip:SetHyperlink("item:"..itemID) AtlasLootCacheTooltip:SetHyperlink("item:"..itemID)
AtlasLootItemsFrame.refreshTime = refreshTimeout AtlasLootItemsFrame.refreshTime = refreshTimeout
AtlasLootItemsFrame.queue[itemID] = true AtlasLootItemsFrame.queue[itemID] = true
iconBorder:SetBackdropBorderColor(1, 0, 0) iconBorder:SetVertexColor(1, 0, 0)
end end
text = AtlasLoot_FixText(dataSource[dataID][i][3]); text = AtlasLoot_FixText(dataSource[dataID][i][3]);
end end
@@ -1120,7 +1124,7 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame)
if ( quality ) then if ( quality ) then
r, g, b, color = GetItemQualityColor(quality) r, g, b, color = GetItemQualityColor(quality)
text = color..(text or "") text = color..(text or "")
iconBorder:SetBackdropBorderColor(r, g, b) iconBorder:SetVertexColor(r, g, b)
end end
itemButton.dressingroomID = craftItem; itemButton.dressingroomID = craftItem;
else else
@@ -1160,7 +1164,7 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame)
if ( quality ) then if ( quality ) then
r, g, b, color = GetItemQualityColor(quality) r, g, b, color = GetItemQualityColor(quality)
text = color..(text or "") text = color..(text or "")
iconBorder:SetBackdropBorderColor(r, g, b) iconBorder:SetVertexColor(r, g, b)
end end
itemButton.dressingroomID = craftItem; itemButton.dressingroomID = craftItem;
else else
@@ -1270,7 +1274,7 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame)
itemButton.itemIDExtra = dataSource[dataID][i][4]; itemButton.itemIDExtra = dataSource[dataID][i][4];
itemButton.container = dataSource[dataID][i][16] itemButton.container = dataSource[dataID][i][16]
if ( type(itemButton.container) == "table" ) then if ( type(itemButton.container) == "table" ) then
iconBorder:SetBackdropBorderColor(1, 0.82, 0) iconBorder:SetVertexColor(1, 0.82, 0)
for row = 1, getn(itemButton.container) do for row = 1, getn(itemButton.container) do
for item = 1, getn(itemButton.container[row]) do for item = 1, getn(itemButton.container[row]) do
AtlasLoot_CacheItem(itemButton.container[row][item][1]) AtlasLoot_CacheItem(itemButton.container[row][item][1])
@@ -1386,27 +1390,9 @@ function AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame)
AtlasLootDefaultFrame_SelectedTable:Hide() AtlasLootDefaultFrame_SelectedTable:Hide()
end end
-- Anchor the item frame where it is supposed to be -- Anchor the item frame where it is supposed to be
if ( pFrame ) then AtlasLootItemsFrame:SetParent(_G[AtlasLoot_AnchorPoint[2]]);
-- If a pFrame is specified, use it AtlasLootItemsFrame:ClearAllPoints();
if ( pFrame == AtlasFrame and AtlasFrame ) then AtlasLootItemsFrame:SetPoint(AtlasLoot_AnchorPoint[1], AtlasLoot_AnchorPoint[2], AtlasLoot_AnchorPoint[3], AtlasLoot_AnchorPoint[4], AtlasLoot_AnchorPoint[5]);
AtlasLootItemsFrame:ClearAllPoints();
AtlasLootItemsFrame:SetParent(AtlasFrame);
AtlasLootItemsFrame:SetPoint("TOPLEFT", "AtlasFrame", "TOPLEFT", 18, -84);
else
AtlasLootItemsFrame:ClearAllPoints();
AtlasLootItemsFrame:SetParent(pFrame[2]);
AtlasLootItemsFrame:SetPoint(pFrame[1], pFrame[2], pFrame[3], pFrame[4], pFrame[5]);
end
elseif ( AtlasFrame ) then
-- If no pFrame is specified and Atlas is installed, anchor in Atlas
AtlasLootItemsFrame:ClearAllPoints();
AtlasLootItemsFrame:SetParent(AtlasFrame);
AtlasLootItemsFrame:SetPoint("TOPLEFT", "AtlasFrame", "TOPLEFT", 18, -84);
elseif ( AtlasLootDefaultFrame ) then
AtlasLootItemsFrame:ClearAllPoints();
AtlasLootItemsFrame:SetParent(AtlasLootDefaultFrame);
AtlasLootItemsFrame:SetPoint("TOPLEFT", "AtlasLootDefaultFrame", "TOPLEFT", 0, 0);
end
AtlasLootItemsFrame:Show(); AtlasLootItemsFrame:Show();
end end
@@ -1425,7 +1411,7 @@ function AtlasLoot_HewdropClick(tablename, text, tabletype)
-- If the button clicked was linked to a loot table -- If the button clicked was linked to a loot table
if ( tabletype == "Table" ) then if ( tabletype == "Table" ) then
-- Show the loot table -- Show the loot table
AtlasLoot_ShowBossLoot(tablename, text, AtlasLoot_AnchorPoint); AtlasLoot_ShowBossLoot(tablename, text);
-- Save needed info for fuure re-display of the table -- Save needed info for fuure re-display of the table
AtlasLootCharDB.LastBoss = tablename; AtlasLootCharDB.LastBoss = tablename;
AtlasLootCharDB.LastBossText = text; AtlasLootCharDB.LastBossText = text;
@@ -1438,7 +1424,7 @@ function AtlasLoot_HewdropClick(tablename, text, tabletype)
-- Enable the submenu button -- Enable the submenu button
AtlasLootDefaultFrame_SubMenu:Enable(); AtlasLootDefaultFrame_SubMenu:Enable();
-- Show the first loot table associated with the submenu -- Show the first loot table associated with the submenu
AtlasLoot_ShowBossLoot(AtlasLoot_HewdropDown_SubTables[tablename][1][2], AtlasLoot_HewdropDown_SubTables[tablename][1][1], AtlasLoot_AnchorPoint); AtlasLoot_ShowBossLoot(AtlasLoot_HewdropDown_SubTables[tablename][1][2], AtlasLoot_HewdropDown_SubTables[tablename][1][1]);
-- Save needed info for fuure re-display of the table -- Save needed info for fuure re-display of the table
AtlasLootCharDB.LastBoss = AtlasLoot_HewdropDown_SubTables[tablename][1][2]; AtlasLootCharDB.LastBoss = AtlasLoot_HewdropDown_SubTables[tablename][1][2];
AtlasLootCharDB.LastBossText = AtlasLoot_HewdropDown_SubTables[tablename][1][1]; AtlasLootCharDB.LastBossText = AtlasLoot_HewdropDown_SubTables[tablename][1][1];
@@ -1465,7 +1451,7 @@ function AtlasLoot_HewdropSubMenuClick(tablename, text)
-- Definition of where I want the loot table to be shown -- Definition of where I want the loot table to be shown
AtlasLoot_AnchorPoint = Anchor_Default AtlasLoot_AnchorPoint = Anchor_Default
-- Show the select loot table -- Show the select loot table
AtlasLoot_ShowBossLoot(tablename, text, AtlasLoot_AnchorPoint); AtlasLoot_ShowBossLoot(tablename, text);
-- Save needed info for fuure re-display of the table -- Save needed info for fuure re-display of the table
AtlasLootCharDB.LastBoss = tablename; AtlasLootCharDB.LastBoss = tablename;
AtlasLootCharDB.LastBossText = text; AtlasLootCharDB.LastBossText = text;
@@ -1665,19 +1651,19 @@ function AtlasLoot_OpenMenu(menuName)
AtlasLootCharDB.LastBoss = this.lootpage; AtlasLootCharDB.LastBoss = this.lootpage;
AtlasLootCharDB.LastBossText = menuName; AtlasLootCharDB.LastBossText = menuName;
if ( menuName == AL["Crafting"] ) then if ( menuName == AL["Crafting"] ) then
AtlasLoot_ShowItemsFrame("CRAFTINGMENU", "dummy", "dummy", AtlasLoot_AnchorPoint) AtlasLoot_ShowItemsFrame("CRAFTINGMENU", "dummy", "dummy")
elseif ( menuName == AL["PvP Rewards"] ) then elseif ( menuName == AL["PvP Rewards"] ) then
AtlasLoot_ShowItemsFrame("PVPMENU", "dummy", "dummy", AtlasLoot_AnchorPoint) AtlasLoot_ShowItemsFrame("PVPMENU", "dummy", "dummy")
elseif ( menuName == AL["World Events"] ) then elseif ( menuName == AL["World Events"] ) then
AtlasLoot_ShowItemsFrame("WORLDEVENTMENU", "dummy", "dummy", AtlasLoot_AnchorPoint) AtlasLoot_ShowItemsFrame("WORLDEVENTMENU", "dummy", "dummy")
elseif ( menuName == AL["Collections"] ) then elseif ( menuName == AL["Collections"] ) then
AtlasLoot_ShowItemsFrame("SETMENU", "dummy", "dummy", AtlasLoot_AnchorPoint) AtlasLoot_ShowItemsFrame("SETMENU", "dummy", "dummy")
elseif ( menuName == AL["Factions"] ) then elseif ( menuName == AL["Factions"] ) then
AtlasLoot_ShowItemsFrame("REPMENU", "dummy", "dummy", AtlasLoot_AnchorPoint) AtlasLoot_ShowItemsFrame("REPMENU", "dummy", "dummy")
elseif ( menuName == AL["World Bosses"] ) then elseif ( menuName == AL["World Bosses"] ) then
AtlasLoot_ShowItemsFrame("WORLDBOSSMENU", "dummy", "dummy", AtlasLoot_AnchorPoint) AtlasLoot_ShowItemsFrame("WORLDBOSSMENU", "dummy", "dummy")
elseif ( menuName == AL["Dungeons & Raids"] ) then elseif ( menuName == AL["Dungeons & Raids"] ) then
AtlasLoot_ShowItemsFrame("DUNGEONSMENU1", "dummy", "dummy", AtlasLoot_AnchorPoint) AtlasLoot_ShowItemsFrame("DUNGEONSMENU1", "dummy", "dummy")
end end
CloseDropDownMenus() CloseDropDownMenus()
end end
@@ -1739,7 +1725,7 @@ function AtlasLootMenuItem_OnClick()
CloseDropDownMenus() CloseDropDownMenus()
AtlasLootCharDB.LastBoss = this.lootpage; AtlasLootCharDB.LastBoss = this.lootpage;
AtlasLootCharDB.LastBossText = pagename; AtlasLootCharDB.LastBossText = pagename;
AtlasLoot_ShowBossLoot(this.lootpage, pagename, AtlasLoot_AnchorPoint); AtlasLoot_ShowBossLoot(this.lootpage, pagename);
AtlasLootDefaultFrame_SelectedCategory:SetText(pagename); AtlasLootDefaultFrame_SelectedCategory:SetText(pagename);
AtlasLootDefaultFrame_SelectedCategory:Show(); AtlasLootDefaultFrame_SelectedCategory:Show();
end end
@@ -1750,7 +1736,7 @@ AtlasLoot_NavButton_OnClick:
Called when <-, -> or 'Back' are pressed and calls up the appropriate loot page Called when <-, -> or 'Back' are pressed and calls up the appropriate loot page
]] ]]
function AtlasLoot_NavButton_OnClick() function AtlasLoot_NavButton_OnClick()
if ( AtlasLootItemsFrame.refresh and AtlasLootItemsFrame.refresh[1] and AtlasLootItemsFrame.refresh[2] and AtlasLootItemsFrame.refresh[4] ) then if ( AtlasLootItemsFrame.refresh and AtlasLootItemsFrame.refresh[1] and AtlasLootItemsFrame.refresh[2]) then
if ( AtlasLootItemsFrame.refresh[1] == "DUNGEONSMENU1" ) then if ( AtlasLootItemsFrame.refresh[1] == "DUNGEONSMENU1" ) then
AtlasLootItemsFrame.refresh[1] = "DUNGEONSMENU2" AtlasLootItemsFrame.refresh[1] = "DUNGEONSMENU2"
AtlasLoot_DungeonsMenu2() AtlasLoot_DungeonsMenu2()
@@ -1763,13 +1749,13 @@ function AtlasLoot_NavButton_OnClick()
return return
end end
if ( string.sub(this.lootpage, 1, 16) == "SearchResultPage" ) then if ( string.sub(this.lootpage, 1, 16) == "SearchResultPage" ) then
AtlasLoot_ShowItemsFrame("SearchResult", this.lootpage, string.format((AL["Search Result: %s"]), AtlasLootCharDB.LastSearchedText or ""), AtlasLootItemsFrame.refresh[4]); AtlasLoot_ShowItemsFrame("SearchResult", this.lootpage, string.format((AL["Search Result: %s"]), AtlasLootCharDB.LastSearchedText or ""));
elseif ( string.sub(this.lootpage, 1, 12) == "WishListPage" ) then elseif ( string.sub(this.lootpage, 1, 12) == "WishListPage" ) then
AtlasLoot_ShowItemsFrame("WishList", this.lootpage, AL["WishList"], AtlasLootItemsFrame.refresh[4]); AtlasLoot_ShowItemsFrame("WishList", this.lootpage, AL["WishList"]);
else else
AtlasLootCharDB.LastBoss = this.lootpage; AtlasLootCharDB.LastBoss = this.lootpage;
AtlasLootCharDB.LastBossText = this.title; AtlasLootCharDB.LastBossText = this.title;
AtlasLoot_ShowItemsFrame(this.lootpage, AtlasLootItemsFrame.refresh[2], this.title, AtlasLoot_AnchorPoint); AtlasLoot_ShowItemsFrame(this.lootpage, AtlasLootItemsFrame.refresh[2], this.title);
if ( AtlasLootDefaultFrame_SelectedTable:GetText() ) then if ( AtlasLootDefaultFrame_SelectedTable:GetText() ) then
AtlasLootDefaultFrame_SelectedTable:SetText(AtlasLoot_BossName:GetText()) AtlasLootDefaultFrame_SelectedTable:SetText(AtlasLoot_BossName:GetText())
else else
@@ -1777,10 +1763,10 @@ function AtlasLoot_NavButton_OnClick()
end end
end end
elseif ( AtlasLootItemsFrame.refresh and AtlasLootItemsFrame.refresh[2] ) then elseif ( AtlasLootItemsFrame.refresh and AtlasLootItemsFrame.refresh[2] ) then
AtlasLoot_ShowItemsFrame(this.lootpage, AtlasLootItemsFrame.refresh[2], this.title, AtlasLoot_AnchorPoint); AtlasLoot_ShowItemsFrame(this.lootpage, AtlasLootItemsFrame.refresh[2], this.title);
else else
-- Fallback for if the requested loot page is a menu and does not have a .refresh instance -- Fallback for if the requested loot page is a menu and does not have a .refresh instance
AtlasLoot_ShowItemsFrame(this.lootpage, "dummy", this.title, AtlasLoot_AnchorPoint); AtlasLoot_ShowItemsFrame(this.lootpage, "dummy", this.title);
end end
for k in pairs(AtlasLoot_MenuList) do for k in pairs(AtlasLoot_MenuList) do
if ( this.lootpage == k ) then if ( this.lootpage == k ) then
@@ -1841,7 +1827,7 @@ function AtlasLoot_ShowQuickLooks(button)
"tooltipTitle", AL["QuickLook"].." 1", "tooltipTitle", AL["QuickLook"].." 1",
"tooltipText", AL["Assign this loot table\n to QuickLook"].." 1", "tooltipText", AL["Assign this loot table\n to QuickLook"].." 1",
"func", function() "func", function()
AtlasLootCharDB["QuickLooks"][1] = {AtlasLootItemsFrame.refresh[1], AtlasLootItemsFrame.refresh[2], AtlasLootItemsFrame.refresh[3], AtlasLootItemsFrame.refresh[4]}; AtlasLootCharDB["QuickLooks"][1] = {AtlasLootItemsFrame.refresh[1], AtlasLootItemsFrame.refresh[2], AtlasLootItemsFrame.refresh[3]};
AtlasLoot_RefreshQuickLookButtons(); AtlasLoot_RefreshQuickLookButtons();
Hewdrop:Close(1); Hewdrop:Close(1);
end end
@@ -1851,7 +1837,7 @@ function AtlasLoot_ShowQuickLooks(button)
"tooltipTitle", AL["QuickLook"].." 2", "tooltipTitle", AL["QuickLook"].." 2",
"tooltipText", AL["Assign this loot table\n to QuickLook"].." 2", "tooltipText", AL["Assign this loot table\n to QuickLook"].." 2",
"func", function() "func", function()
AtlasLootCharDB["QuickLooks"][2] = {AtlasLootItemsFrame.refresh[1], AtlasLootItemsFrame.refresh[2], AtlasLootItemsFrame.refresh[3], AtlasLootItemsFrame.refresh[4]}; AtlasLootCharDB["QuickLooks"][2] = {AtlasLootItemsFrame.refresh[1], AtlasLootItemsFrame.refresh[2], AtlasLootItemsFrame.refresh[3]};
AtlasLoot_RefreshQuickLookButtons(); AtlasLoot_RefreshQuickLookButtons();
Hewdrop:Close(1); Hewdrop:Close(1);
end end
@@ -1861,7 +1847,7 @@ function AtlasLoot_ShowQuickLooks(button)
"tooltipTitle", AL["QuickLook"].." 3", "tooltipTitle", AL["QuickLook"].." 3",
"tooltipText", AL["Assign this loot table\n to QuickLook"].." 3", "tooltipText", AL["Assign this loot table\n to QuickLook"].." 3",
"func", function() "func", function()
AtlasLootCharDB["QuickLooks"][3] = {AtlasLootItemsFrame.refresh[1], AtlasLootItemsFrame.refresh[2], AtlasLootItemsFrame.refresh[3], AtlasLootItemsFrame.refresh[4]}; AtlasLootCharDB["QuickLooks"][3] = {AtlasLootItemsFrame.refresh[1], AtlasLootItemsFrame.refresh[2], AtlasLootItemsFrame.refresh[3]};
AtlasLoot_RefreshQuickLookButtons(); AtlasLoot_RefreshQuickLookButtons();
Hewdrop:Close(1); Hewdrop:Close(1);
end end
@@ -1871,7 +1857,7 @@ function AtlasLoot_ShowQuickLooks(button)
"tooltipTitle", AL["QuickLook"].." 4", "tooltipTitle", AL["QuickLook"].." 4",
"tooltipText", AL["Assign this loot table\n to QuickLook"].." 4", "tooltipText", AL["Assign this loot table\n to QuickLook"].." 4",
"func", function() "func", function()
AtlasLootCharDB["QuickLooks"][4] = {AtlasLootItemsFrame.refresh[1], AtlasLootItemsFrame.refresh[2], AtlasLootItemsFrame.refresh[3], AtlasLootItemsFrame.refresh[4]}; AtlasLootCharDB["QuickLooks"][4] = {AtlasLootItemsFrame.refresh[1], AtlasLootItemsFrame.refresh[2], AtlasLootItemsFrame.refresh[3]};
AtlasLoot_RefreshQuickLookButtons(); AtlasLoot_RefreshQuickLookButtons();
Hewdrop:Close(1); Hewdrop:Close(1);
end end
@@ -1921,19 +1907,19 @@ pFrame - Data structure describing how and where to anchor the item frame (more
This is the intended API for external mods to use for displaying loot pages. This is the intended API for external mods to use for displaying loot pages.
This function figures out where the loot table is stored, then sends the relevant info to AtlasLoot_ShowItemsFrame This function figures out where the loot table is stored, then sends the relevant info to AtlasLoot_ShowItemsFrame
]] ]]
function AtlasLoot_ShowBossLoot(dataID, boss, pFrame) function AtlasLoot_ShowBossLoot(dataID, boss)
local tableavailable = AtlasLoot_IsLootTableAvailable(dataID); local tableavailable = AtlasLoot_IsLootTableAvailable(dataID);
if ( tableavailable ) then if ( tableavailable ) then
AtlasLootItemsFrame:Hide(); AtlasLootItemsFrame:Hide();
-- If the loot table is already being displayed, it is hidden and the current table selection cancelled -- If the loot table is already being displayed, it is hidden and the current table selection cancelled
if ( dataID == AtlasLootItemsFrame.externalBoss and AtlasLootItemsFrame:GetParent() ~= AtlasFrame and AtlasLootItemsFrame:GetParent() ~= AtlasLootDefaultFrame_LootBackground ) then if ( dataID == AtlasLootItemsFrame.externalBoss and AtlasLootItemsFrame:GetParent() ~= AtlasFrame and AtlasLootItemsFrame:GetParent() ~= AtlasLootDefaultFrame ) then
AtlasLootItemsFrame.externalBoss = nil; AtlasLootItemsFrame.externalBoss = nil;
else else
-- Use the original WoW instance data by default -- Use the original WoW instance data by default
local dataSource = AtlasLoot_TableNames[dataID][2]; local dataSource = AtlasLoot_TableNames[dataID][2];
-- Set selected table and call AtlasLoot_ShowItemsFrame -- Set selected table and call AtlasLoot_ShowItemsFrame
AtlasLootItemsFrame.externalBoss = dataID; AtlasLootItemsFrame.externalBoss = dataID;
AtlasLoot_ShowItemsFrame(dataID, dataSource, boss, pFrame); AtlasLoot_ShowItemsFrame(dataID, dataSource, boss);
end end
end end
end end
@@ -3124,7 +3110,6 @@ function AtlasLootItem_OnClick(arg1)
local dataID = AtlasLootItemsFrame.refresh[1] local dataID = AtlasLootItemsFrame.refresh[1]
local dataSource = AtlasLootItemsFrame.refresh[2] local dataSource = AtlasLootItemsFrame.refresh[2]
local bossName = AtlasLootItemsFrame.refresh[3] local bossName = AtlasLootItemsFrame.refresh[3]
local framePoint = AtlasLootItemsFrame.refresh[4]
if ( string.sub(this.itemID, 1, 1) == "s" ) then if ( string.sub(this.itemID, 1, 1) == "s" ) then
isItem = false; isItem = false;
isEnchant = false; isEnchant = false;
@@ -3149,10 +3134,10 @@ function AtlasLootItem_OnClick(arg1)
DEFAULT_CHAT_FRAME:AddMessage(AL["Server queried for "]..color.."["..name.."]".."|r"..AL[". Right click on any other item to refresh the loot page."]); DEFAULT_CHAT_FRAME:AddMessage(AL["Server queried for "]..color.."["..name.."]".."|r"..AL[". Right click on any other item to refresh the loot page."]);
end end
AtlasLootItemsFrame:Hide(); AtlasLootItemsFrame:Hide();
AtlasLoot_ShowItemsFrame(dataID, dataSource, bossName, framePoint); AtlasLoot_ShowItemsFrame(dataID, dataSource, bossName);
elseif ( arg1 == "RightButton" and itemName ) then elseif ( arg1 == "RightButton" and itemName ) then
AtlasLootItemsFrame:Hide(); AtlasLootItemsFrame:Hide();
AtlasLoot_ShowItemsFrame(dataID, dataSource, bossName, framePoint); AtlasLoot_ShowItemsFrame(dataID, dataSource, bossName);
if ( not AtlasLootCharDB.ItemSpam ) then if ( not AtlasLootCharDB.ItemSpam ) then
DEFAULT_CHAT_FRAME:AddMessage(itemName..AL[" is safe."]); DEFAULT_CHAT_FRAME:AddMessage(itemName..AL[" is safe."]);
DEFAULT_CHAT_FRAME:AddMessage(AtlasLootItemsFrame.activeBoss) DEFAULT_CHAT_FRAME:AddMessage(AtlasLootItemsFrame.activeBoss)
@@ -3197,7 +3182,7 @@ function AtlasLootItem_OnClick(arg1)
elseif ( (dataID == "SearchResult" or dataID == "WishList") and this.sourcePage ) then elseif ( (dataID == "SearchResult" or dataID == "WishList") and this.sourcePage ) then
local _, _, dataID, dataSource = strfind(this.sourcePage, "(.+)|(.+)"); local _, _, dataID, dataSource = strfind(this.sourcePage, "(.+)|(.+)");
if ( dataID and dataSource and AtlasLoot_IsLootTableAvailable(dataID) ) then if ( dataID and dataSource and AtlasLoot_IsLootTableAvailable(dataID) ) then
AtlasLoot_ShowItemsFrame(dataID, dataSource, AtlasLoot_TableNames[dataID][1], framePoint); AtlasLoot_ShowItemsFrame(dataID, dataSource, AtlasLoot_TableNames[dataID][1]);
end end
elseif ( this.container and arg1 == "LeftButton" ) then elseif ( this.container and arg1 == "LeftButton" ) then
AtlasLoot_ShowContainerFrame() AtlasLoot_ShowContainerFrame()
@@ -3218,7 +3203,7 @@ function AtlasLootItem_OnClick(arg1)
elseif ( (dataID == "SearchResult" or dataID == "WishList") and this.sourcePage ) then elseif ( (dataID == "SearchResult" or dataID == "WishList") and this.sourcePage ) then
local _, _, dataID, dataSource = strfind(this.sourcePage, "(.+)|(.+)"); local _, _, dataID, dataSource = strfind(this.sourcePage, "(.+)|(.+)");
if ( dataID and dataSource and AtlasLoot_IsLootTableAvailable(dataID) ) then if ( dataID and dataSource and AtlasLoot_IsLootTableAvailable(dataID) ) then
AtlasLoot_ShowItemsFrame(dataID, dataSource, bossName, framePoint); AtlasLoot_ShowItemsFrame(dataID, dataSource, bossName);
end end
end end
elseif ( isSpell ) then elseif ( isSpell ) then
@@ -3254,7 +3239,7 @@ function AtlasLootItem_OnClick(arg1)
elseif ( (dataID == "SearchResult" or dataID == "WishList") and this.sourcePage ) then elseif ( (dataID == "SearchResult" or dataID == "WishList") and this.sourcePage ) then
local _, _, dataID, dataSource = strfind(this.sourcePage, "(.+)|(.+)"); local _, _, dataID, dataSource = strfind(this.sourcePage, "(.+)|(.+)");
if ( dataID and dataSource and AtlasLoot_IsLootTableAvailable(dataID) ) then if ( dataID and dataSource and AtlasLoot_IsLootTableAvailable(dataID) ) then
AtlasLoot_ShowItemsFrame(dataID, dataSource, bossName, framePoint); AtlasLoot_ShowItemsFrame(dataID, dataSource, bossName);
end end
end end
end end
@@ -3605,7 +3590,7 @@ function AtlasLoot_QuickLook_OnClick(id)
else else
AtlasLoot_AnchorPoint = Anchor_Default AtlasLoot_AnchorPoint = Anchor_Default
end end
AtlasLoot_ShowItemsFrame(AtlasLootCharDB["QuickLooks"][id][1], AtlasLootCharDB["QuickLooks"][id][2], AtlasLootCharDB["QuickLooks"][id][3], AtlasLoot_AnchorPoint); AtlasLoot_ShowItemsFrame(AtlasLootCharDB["QuickLooks"][id][1], AtlasLootCharDB["QuickLooks"][id][2], AtlasLootCharDB["QuickLooks"][id][3]);
end end
function AtlasLoot_QuickLook_OnShow(id) function AtlasLoot_QuickLook_OnShow(id)
Core/AtlasLoot.xml
+41 -81
View File
@@ -143,25 +143,6 @@
</OnShow> </OnShow>
</Scripts> </Scripts>
</Button> </Button>
<Frame name="$parent_LootBackground">
<Size x="515" y="515"/>
<Anchors>
<Anchor point="BOTTOM">
<Offset x="0" y="90"/>
</Anchor>
</Anchors>
<Layers>
<Layer level="BACKGROUND">
<Texture name="$parent_Back">
<Anchors>
<Anchor point="TOPLEFT"/>
<Anchor point="BOTTOMRIGHT"/>
</Anchors>
<Color r="0" g="0" b="0" a="0"/>
</Texture>
</Layer>
</Layers>
</Frame>
<Button name="$parent_Preset1" inherits="AtlasLootDefaultFrameButtonTemplate"> <Button name="$parent_Preset1" inherits="AtlasLootDefaultFrameButtonTemplate">
<Anchors> <Anchors>
<Anchor point="BOTTOMLEFT" relativeTo="$parent" relativePoint="BOTTOMLEFT"> <Anchor point="BOTTOMLEFT" relativeTo="$parent" relativePoint="BOTTOMLEFT">
@@ -490,39 +471,11 @@
</Scripts> </Scripts>
</Button> </Button>
<Button name="AtlasLootNextButtonTemplate" virtual="true" hidden="true" frameStrata="MEDIUM">
<Size x="32" y="32"/>
<NormalTexture file="Interface\Buttons\UI-SpellbookIcon-NextPage-Up"/>
<PushedTexture file="Interface\Buttons\UI-SpellbookIcon-NextPage-Down"/>
<DisabledTexture file="Interface\Buttons\UI-SpellbookIcon-NextPage-Disabled"/>
<HighlightTexture file="Interface\Buttons\UI-Common-MouseHilight" alphaMode="ADD"/>
</Button>
<Button name="AtlasLootPrevButtonTemplate" virtual="true" hidden="true" frameStrata="MEDIUM">
<Size x="32" y="32"/>
<NormalTexture file="Interface\Buttons\UI-SpellbookIcon-PrevPage-Up"/>
<PushedTexture file="Interface\Buttons\UI-SpellbookIcon-PrevPage-Down"/>
<DisabledTexture file="Interface\Buttons\UI-SpellbookIcon-PrevPage-Disabled"/>
<HighlightTexture file="Interface\Buttons\UI-Common-MouseHilight" alphaMode="ADD"/>
</Button>
<Button name="AtlasLootClassButtonTemplate" inherits="OptionsButtonTemplate" virtual="true" hidden="true">
<Scripts>
<OnClick>
AtlasLoot_NavButton_OnClick();
CloseDropDownMenus();
</OnClick>
<OnShow>
this:SetFrameLevel((this:GetParent()):GetFrameLevel() + 1);
</OnShow>
</Scripts>
</Button>
<Button name="AtlasLootPanelButtonTemplate" inherits="OptionsButtonTemplate" virtual="true"> <Button name="AtlasLootPanelButtonTemplate" inherits="OptionsButtonTemplate" virtual="true">
<Size x="120" y="20"/> <Size x="120" y="20"/>
</Button> </Button>
<Button name="AtlasLootItem_ParentTemplate" virtual="true"> <Button name="AtlasLootItem_ParentTemplate" toplevel="true" virtual="true">
<Size x="236" y="28"/> <Size x="236" y="28"/>
<HighlightTexture file="Interface\QuestFrame\UI-QuestTitleHighlight" alphaMode="ADD"/> <HighlightTexture file="Interface\QuestFrame\UI-QuestTitleHighlight" alphaMode="ADD"/>
<Layers> <Layers>
@@ -647,19 +600,16 @@
<Color r="1" g="0" b="0" a="1"/> <Color r="1" g="0" b="0" a="1"/>
</Texture> </Texture>
</Layer> </Layer>
<Layer level="OVERLAY">
<Texture name="$parent_IconBorder" file="Interface\AddOns\AtlasLoot\Images\border">
<Size x="33" y="33"/>
<Anchors>
<Anchor point="CENTER" relativeTo="$parent_Icon"/>
</Anchors>
<Color r="1" g="1" b="1" a="1"/>
</Texture>
</Layer>
</Layers> </Layers>
<Frames>
<Frame name="$parent_IconBorder" frameLevel="30">
<Size x="33" y="33"/>
<Anchors>
<Anchor point="CENTER" relativeTo="$parent_Icon"/>
</Anchors>
<Backdrop edgeFile="Interface\Tooltips\UI-Tooltip-Border">
<EdgeSize val="16"/>
<BorderColor r="1" g="1" b="1" a="1"/>
</Backdrop>
</Frame>
</Frames>
</Button> </Button>
<Button name="AtlasLootItem_Template" inherits="AtlasLootItem_ParentTemplate" virtual="true"> <Button name="AtlasLootItem_Template" inherits="AtlasLootItem_ParentTemplate" virtual="true">
@@ -677,9 +627,6 @@
AtlasLootItem_OnClick(arg1); AtlasLootItem_OnClick(arg1);
CloseDropDownMenus(); CloseDropDownMenus();
</OnClick> </OnClick>
<OnShow>
this:SetFrameLevel((this:GetParent()):GetFrameLevel() + 1);
</OnShow>
</Scripts> </Scripts>
</Button> </Button>
@@ -1100,14 +1047,43 @@
<Anchor point="TOPLEFT" relativeTo="AtlasLootItem_29" relativePoint="BOTTOMLEFT"/> <Anchor point="TOPLEFT" relativeTo="AtlasLootItem_29" relativePoint="BOTTOMLEFT"/>
</Anchors> </Anchors>
</Button> </Button>
<Button name="$parent_BACK" inherits="AtlasLootClassButtonTemplate" hidden="true"> <Button name="$parent_BACK" toplevel="true" inherits="OptionsButtonTemplate" hidden="true">
<Anchors> <Anchors>
<Anchor point="BOTTOM"> <Anchor point="BOTTOM">
<Offset x="0" y="8"/> <Offset x="0" y="8"/>
</Anchor> </Anchor>
</Anchors> </Anchors>
<Scripts>
<OnClick>
AtlasLoot_NavButton_OnClick();
CloseDropDownMenus();
</OnClick>
</Scripts>
</Button> </Button>
<Button name="$parent_NEXT" inherits="AtlasLootNextButtonTemplate"> <Button name="$parent_PREV" toplevel="true" inherits="AtlasLootPrevButtonTemplate">
<Size x="32" y="32"/>
<NormalTexture file="Interface\Buttons\UI-SpellbookIcon-PrevPage-Up"/>
<PushedTexture file="Interface\Buttons\UI-SpellbookIcon-PrevPage-Down"/>
<DisabledTexture file="Interface\Buttons\UI-SpellbookIcon-PrevPage-Disabled"/>
<HighlightTexture file="Interface\Buttons\UI-Common-MouseHilight" alphaMode="ADD"/>
<Anchors>
<Anchor point="BOTTOMLEFT" relativeTo="$parent" relativePoint="BOTTOMLEFT">
<Offset x="12" y="8"/>
</Anchor>
</Anchors>
<Scripts>
<OnClick>
AtlasLoot_NavButton_OnClick();
CloseDropDownMenus();
</OnClick>
</Scripts>
</Button>
<Button name="$parent_NEXT" toplevel="true" inherits="AtlasLootNextButtonTemplate">
<Size x="32" y="32"/>
<NormalTexture file="Interface\Buttons\UI-SpellbookIcon-NextPage-Up"/>
<PushedTexture file="Interface\Buttons\UI-SpellbookIcon-NextPage-Down"/>
<DisabledTexture file="Interface\Buttons\UI-SpellbookIcon-NextPage-Disabled"/>
<HighlightTexture file="Interface\Buttons\UI-Common-MouseHilight" alphaMode="ADD"/>
<Anchors> <Anchors>
<Anchor point="BOTTOMRIGHT"> <Anchor point="BOTTOMRIGHT">
<Offset x="-5" y="5"/> <Offset x="-5" y="5"/>
@@ -1182,22 +1158,6 @@
</OnClick> </OnClick>
</Scripts> </Scripts>
</Button> </Button>
<Button name="$parent_PREV" inherits="AtlasLootPrevButtonTemplate">
<Anchors>
<Anchor point="BOTTOMLEFT" relativeTo="$parent" relativePoint="BOTTOMLEFT">
<Offset x="12" y="8"/>
</Anchor>
</Anchors>
<Scripts>
<OnClick>
AtlasLoot_NavButton_OnClick();
CloseDropDownMenus();
</OnClick>
<OnShow>
this:SetFrameLevel((this:GetParent()):GetFrameLevel() + 1);
</OnShow>
</Scripts>
</Button>
<Frame name="$parentContainer" enableMouse="true" frameStrata="TOOLTIP" hidden="true" toplevel="true" movable="true" clampedToScreen="true"> <Frame name="$parentContainer" enableMouse="true" frameStrata="TOOLTIP" hidden="true" toplevel="true" movable="true" clampedToScreen="true">
<Size x="40" y="40"/> <Size x="40" y="40"/>
<Anchors> <Anchors>
Core/Search.lua
+2 -2
View File
@@ -11,7 +11,7 @@ local currentPage = 1;
local SearchResult = nil; local SearchResult = nil;
function AtlasLoot:ShowSearchResult() function AtlasLoot:ShowSearchResult()
AtlasLoot_ShowItemsFrame("SearchResult", "SearchResultPage"..currentPage, string.format((AL["Search Result: %s"]), AtlasLootCharDB.LastSearchedText or ""), AtlasLoot_AnchorPoint); AtlasLoot_ShowItemsFrame("SearchResult", "SearchResultPage"..currentPage, string.format((AL["Search Result: %s"]), AtlasLootCharDB.LastSearchedText or ""));
end end
local function strtrim(s) local function strtrim(s)
@@ -101,7 +101,7 @@ function AtlasLoot:Search(Text)
else else
currentPage = 1; currentPage = 1;
SearchResult = AtlasLoot_CategorizeWishList(AtlasLootCharDB["SearchResult"]); SearchResult = AtlasLoot_CategorizeWishList(AtlasLootCharDB["SearchResult"]);
AtlasLoot_ShowItemsFrame("SearchResult", "SearchResultPage1", string.format((AL["Search Result: %s"]), AtlasLootCharDB.LastSearchedText or ""), AtlasLoot_AnchorPoint); AtlasLoot_ShowItemsFrame("SearchResult", "SearchResultPage1", string.format((AL["Search Result: %s"]), AtlasLootCharDB.LastSearchedText or ""));
end end
end end
Core/Sets.lua
+12 -11
View File
@@ -31,6 +31,7 @@ function AtlasLoot_PrepMenu(backPage, title)
button.container = nil button.container = nil
button.dataSource = nil button.dataSource = nil
_G["AtlasLootMenuItem_" .. i .. "_Icon"]:SetTexCoord(0, 1, 0, 1) _G["AtlasLootMenuItem_" .. i .. "_Icon"]:SetTexCoord(0, 1, 0, 1)
_G["AtlasLootMenuItem_"..i.."_IconBorder"]:SetVertexColor(1, 1, 1)
end end
if backPage then if backPage then
AtlasLootItemsFrame_BACK:Show(); AtlasLootItemsFrame_BACK:Show();
@@ -138,9 +139,9 @@ function AtlasLootSetMenu()
AtlasLootMenuItem_20:Show(); AtlasLootMenuItem_20:Show();
for i = 1, 30 do for i = 1, 30 do
if _G["AtlasLootMenuItem_"..i].container then if _G["AtlasLootMenuItem_"..i].container then
_G["AtlasLootMenuItem_"..i.."_IconBorder"]:SetBackdropBorderColor(1, 0.82, 0) _G["AtlasLootMenuItem_"..i.."_IconBorder"]:SetVertexColor(1, 0.82, 0)
else else
_G["AtlasLootMenuItem_"..i.."_IconBorder"]:SetBackdropBorderColor(1, 1, 1) _G["AtlasLootMenuItem_"..i.."_IconBorder"]:SetVertexColor(1, 1, 1)
end end
end end
end end
@@ -278,7 +279,7 @@ function AtlasLootPRE60SetMenu()
local button = _G["AtlasLootMenuItem_" .. i] local button = _G["AtlasLootMenuItem_" .. i]
button.dataSource = AtlasLoot_GetDataSource(button.lootpage) button.dataSource = AtlasLoot_GetDataSource(button.lootpage)
if ( type(button.container) == "table" ) then if ( type(button.container) == "table" ) then
_G["AtlasLootMenuItem_"..i.."_IconBorder"]:SetBackdropBorderColor(1, 0.82, 0) _G["AtlasLootMenuItem_"..i.."_IconBorder"]:SetVertexColor(1, 0.82, 0)
for row = 1, getn(button.container) do for row = 1, getn(button.container) do
for item = 1, getn(button.container[row]) do for item = 1, getn(button.container[row]) do
AtlasLoot_CacheItem(button.container[row][item][1]) AtlasLoot_CacheItem(button.container[row][item][1])
@@ -378,7 +379,7 @@ function AtlasLootZGSetMenu()
local button = _G["AtlasLootMenuItem_" .. i] local button = _G["AtlasLootMenuItem_" .. i]
button.dataSource = AtlasLoot_GetDataSource(button.lootpage) button.dataSource = AtlasLoot_GetDataSource(button.lootpage)
if ( type(button.container) == "table" ) then if ( type(button.container) == "table" ) then
_G["AtlasLootMenuItem_"..i.."_IconBorder"]:SetBackdropBorderColor(1, 0.82, 0) _G["AtlasLootMenuItem_"..i.."_IconBorder"]:SetVertexColor(1, 0.82, 0)
for row = 1, getn(button.container) do for row = 1, getn(button.container) do
for item = 1, getn(button.container[row]) do for item = 1, getn(button.container[row]) do
AtlasLoot_CacheItem(button.container[row][item][1]) AtlasLoot_CacheItem(button.container[row][item][1])
@@ -457,7 +458,7 @@ function AtlasLootAQ40SetMenu()
local button = _G["AtlasLootMenuItem_" .. i] local button = _G["AtlasLootMenuItem_" .. i]
button.dataSource = AtlasLoot_GetDataSource(button.lootpage) button.dataSource = AtlasLoot_GetDataSource(button.lootpage)
if ( type(button.container) == "table" ) then if ( type(button.container) == "table" ) then
_G["AtlasLootMenuItem_"..i.."_IconBorder"]:SetBackdropBorderColor(1, 0.82, 0) _G["AtlasLootMenuItem_"..i.."_IconBorder"]:SetVertexColor(1, 0.82, 0)
for row = 1, getn(button.container) do for row = 1, getn(button.container) do
for item = 1, getn(button.container[row]) do for item = 1, getn(button.container[row]) do
AtlasLoot_CacheItem(button.container[row][item][1]) AtlasLoot_CacheItem(button.container[row][item][1])
@@ -536,7 +537,7 @@ function AtlasLootAQ20SetMenu()
local button = _G["AtlasLootMenuItem_" .. i] local button = _G["AtlasLootMenuItem_" .. i]
button.dataSource = AtlasLoot_GetDataSource(button.lootpage) button.dataSource = AtlasLoot_GetDataSource(button.lootpage)
if ( type(button.container) == "table" ) then if ( type(button.container) == "table" ) then
_G["AtlasLootMenuItem_"..i.."_IconBorder"]:SetBackdropBorderColor(1, 0.82, 0) _G["AtlasLootMenuItem_"..i.."_IconBorder"]:SetVertexColor(1, 0.82, 0)
for row = 1, getn(button.container) do for row = 1, getn(button.container) do
for item = 1, getn(button.container[row]) do for item = 1, getn(button.container[row]) do
AtlasLoot_CacheItem(button.container[row][item][1]) AtlasLoot_CacheItem(button.container[row][item][1])
@@ -615,7 +616,7 @@ function AtlasLootT0SetMenu()
local button = _G["AtlasLootMenuItem_" .. i] local button = _G["AtlasLootMenuItem_" .. i]
button.dataSource = AtlasLoot_GetDataSource(button.lootpage) button.dataSource = AtlasLoot_GetDataSource(button.lootpage)
if ( type(button.container) == "table" ) then if ( type(button.container) == "table" ) then
_G["AtlasLootMenuItem_"..i.."_IconBorder"]:SetBackdropBorderColor(1, 0.82, 0) _G["AtlasLootMenuItem_"..i.."_IconBorder"]:SetVertexColor(1, 0.82, 0)
for row = 1, getn(button.container) do for row = 1, getn(button.container) do
for item = 1, getn(button.container[row]) do for item = 1, getn(button.container[row]) do
AtlasLoot_CacheItem(button.container[row][item][1]) AtlasLoot_CacheItem(button.container[row][item][1])
@@ -694,7 +695,7 @@ function AtlasLootT1SetMenu()
local button = _G["AtlasLootMenuItem_" .. i] local button = _G["AtlasLootMenuItem_" .. i]
button.dataSource = AtlasLoot_GetDataSource(button.lootpage) button.dataSource = AtlasLoot_GetDataSource(button.lootpage)
if ( type(button.container) == "table" ) then if ( type(button.container) == "table" ) then
_G["AtlasLootMenuItem_"..i.."_IconBorder"]:SetBackdropBorderColor(1, 0.82, 0) _G["AtlasLootMenuItem_"..i.."_IconBorder"]:SetVertexColor(1, 0.82, 0)
for row = 1, getn(button.container) do for row = 1, getn(button.container) do
for item = 1, getn(button.container[row]) do for item = 1, getn(button.container[row]) do
AtlasLoot_CacheItem(button.container[row][item][1]) AtlasLoot_CacheItem(button.container[row][item][1])
@@ -773,7 +774,7 @@ function AtlasLootT2SetMenu()
local button = _G["AtlasLootMenuItem_" .. i] local button = _G["AtlasLootMenuItem_" .. i]
button.dataSource = AtlasLoot_GetDataSource(button.lootpage) button.dataSource = AtlasLoot_GetDataSource(button.lootpage)
if ( type(button.container) == "table" ) then if ( type(button.container) == "table" ) then
_G["AtlasLootMenuItem_"..i.."_IconBorder"]:SetBackdropBorderColor(1, 0.82, 0) _G["AtlasLootMenuItem_"..i.."_IconBorder"]:SetVertexColor(1, 0.82, 0)
for row = 1, getn(button.container) do for row = 1, getn(button.container) do
for item = 1, getn(button.container[row]) do for item = 1, getn(button.container[row]) do
AtlasLoot_CacheItem(button.container[row][item][1]) AtlasLoot_CacheItem(button.container[row][item][1])
@@ -852,7 +853,7 @@ function AtlasLootT3SetMenu()
local button = _G["AtlasLootMenuItem_" .. i] local button = _G["AtlasLootMenuItem_" .. i]
button.dataSource = AtlasLoot_GetDataSource(button.lootpage) button.dataSource = AtlasLoot_GetDataSource(button.lootpage)
if ( type(button.container) == "table" ) then if ( type(button.container) == "table" ) then
_G["AtlasLootMenuItem_"..i.."_IconBorder"]:SetBackdropBorderColor(1, 0.82, 0) _G["AtlasLootMenuItem_"..i.."_IconBorder"]:SetVertexColor(1, 0.82, 0)
for row = 1, getn(button.container) do for row = 1, getn(button.container) do
for item = 1, getn(button.container[row]) do for item = 1, getn(button.container[row]) do
AtlasLoot_CacheItem(button.container[row][item][1]) AtlasLoot_CacheItem(button.container[row][item][1])
@@ -931,7 +932,7 @@ function AtlasLoot_Kara40SetMenu()
local button = _G["AtlasLootMenuItem_" .. i] local button = _G["AtlasLootMenuItem_" .. i]
button.dataSource = AtlasLoot_GetDataSource(button.lootpage) button.dataSource = AtlasLoot_GetDataSource(button.lootpage)
if ( type(button.container) == "table" ) then if ( type(button.container) == "table" ) then
_G["AtlasLootMenuItem_"..i.."_IconBorder"]:SetBackdropBorderColor(1, 0.82, 0) _G["AtlasLootMenuItem_"..i.."_IconBorder"]:SetVertexColor(1, 0.82, 0)
for row = 1, getn(button.container) do for row = 1, getn(button.container) do
for item = 1, getn(button.container[row]) do for item = 1, getn(button.container[row]) do
AtlasLoot_CacheItem(button.container[row][item][1]) AtlasLoot_CacheItem(button.container[row][item][1])
Core/WishList.lua
+2 -2
View File
@@ -19,7 +19,7 @@ AtlasLoot_ShowWishList()
Displays the WishList Displays the WishList
]] ]]
function AtlasLoot_ShowWishList() function AtlasLoot_ShowWishList()
AtlasLoot_ShowItemsFrame("WishList", "WishListPage"..currentPage, AL["WishList"], AtlasLoot_AnchorPoint); AtlasLoot_ShowItemsFrame("WishList", "WishListPage"..currentPage, AL["WishList"]);
CloseDropDownMenus(); CloseDropDownMenus();
AtlasLootDefaultFrame_SubMenu:Disable() AtlasLootDefaultFrame_SubMenu:Disable()
AtlasLootDefaultFrame_SelectedTable:Hide() AtlasLootDefaultFrame_SelectedTable:Hide()
@@ -58,7 +58,7 @@ function AtlasLoot_DeleteFromWishList(itemID)
end end
AtlasLoot_WishList = AtlasLoot_CategorizeWishList(AtlasLootCharDB["WishList"]); AtlasLoot_WishList = AtlasLoot_CategorizeWishList(AtlasLootCharDB["WishList"]);
AtlasLootItemsFrame:Hide(); AtlasLootItemsFrame:Hide();
AtlasLoot_ShowItemsFrame("WishList", "WishListPage"..currentPage, AL["WishList"], AtlasLoot_AnchorPoint); AtlasLoot_ShowItemsFrame("WishList", "WishListPage"..currentPage, AL["WishList"]);
end end
--[[ --[[
Images/border.blp
BIN
View File
Binary file not shown.