Skip to content

Commit 2380b60

Browse files
Release v6.2.2
1 parent 3833781 commit 2380b60

14 files changed

Lines changed: 259 additions & 42 deletions

File tree

EllesmereUI.lua

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6078,7 +6078,7 @@ end
60786078
-------------------------------------------------------------------------------
60796079
-- Slash commands
60806080
-------------------------------------------------------------------------------
6081-
EllesmereUI.VERSION = "6.2.1"
6081+
EllesmereUI.VERSION = "6.2.2"
60826082

60836083
-- Register this addon's version into a shared global table (taint-free at load time)
60846084
if not _G._EUI_AddonVersions then _G._EUI_AddonVersions = {} end
@@ -6266,6 +6266,8 @@ if not _G._EUI_ConflictChecked then
62666266
-- { addon = "Bagnon", label = "Bagnon", targets = { "EllesmereUIBasics" } },
62676267
-- { addon = "BetterBags", label = "BetterBags", targets = { "EllesmereUIBasics" } },
62686268
-- { addon = "Sorted", label = "Sorted", targets = { "EllesmereUIBasics" } },
6269+
{ addon = "FarmHud", label = "FarmHud", targets = { "EllesmereUIBasics" }, moduleCheck = function() return BasicsModuleEnabled("minimap") end,
6270+
message = "FarmHud controls the Minimap frame directly and is incompatible with the EllesmereUI Minimap module. Disable either FarmHud or the EUI Minimap module in Basics settings." },
62696271
{ addon = "UltimateMouseCursor", label = "Ultimate Mouse Cursor", targets = { "EllesmereUICursor" } },
62706272
{ addon = "BetterCooldownManager", label = "Better Cooldown Manager", targets = { "EllesmereUICooldownManager", "EllesmereUIResourceBars" } },
62716273
{ addon = "CooldownManagerCentered", label = "Cooldown Manager Centered", targets = { "EllesmereUICooldownManager" } },
@@ -6783,7 +6785,7 @@ do
67836785
function EllesmereUI.CreateMinimapButton()
67846786
if btn then return btn end
67856787

6786-
btn = CreateFrame("Button", "EllesmereUI", Minimap)
6788+
btn = CreateFrame("Button", "EllesmereUIMinimapButton", Minimap)
67876789
btn:SetSize(BUTTON_SIZE, BUTTON_SIZE)
67886790
btn:SetFrameStrata("MEDIUM")
67896791
btn:SetFrameLevel(8)

EllesmereUI.toc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
## Title: |cff0cd29fEllesmereUI|r
33
## Notes: Shared framework for the EllesmereUI addon suite
44
## Author: Ellesmere
5-
## Version: 6.2.1
5+
## Version: 6.2.2
66
## SavedVariables: EllesmereUIDB
77
## IconTexture: Interface\AddOns\EllesmereUI\media\eg-logo.tga
88
## X-Curse-Project-ID: 1477613

EllesmereUIActionBars/EllesmereUIActionBars.toc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
## Group: EllesmereUI
55
## Notes: Custom Action Bars
66
## Author: Ellesmere
7-
## Version: 6.2.1
7+
## Version: 6.2.2
88
## Dependencies: EllesmereUI
99
## SavedVariables: EllesmereUIActionBarsDB
1010
## IconTexture: Interface\AddOns\EllesmereUI\media\eg-logo.tga

EllesmereUIAuraBuffReminders/EllesmereUIAuraBuffReminders.toc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
## Group: EllesmereUI
55
## Notes: Reminders for upkeeping Auras, Buffs and Consumables
66
## Author: Ellesmere
7-
## Version: 6.2.1
7+
## Version: 6.2.2
88
## Dependencies: EllesmereUI
99
## SavedVariables: EllesmereUIAuraBuffRemindersDB
1010
## IconTexture: Interface\AddOns\EllesmereUI\media\eg-logo.tga

EllesmereUIBasics/EUI_Basics_Options.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ initFrame:SetScript("OnEvent", function(self)
330330
for _, btn in ipairs(btns) do
331331
local name = btn:GetName()
332332
if name and vis[btn] ~= false then
333-
local label = name:gsub("^LibDBIcon10_", ""):gsub("^Lib_GPI_Minimap_", "")
333+
local label = name:gsub("^LibDBIcon10_", ""):gsub("^Lib_GPI_Minimap_", ""):gsub("MinimapButton$", ""):gsub("_MinimapButton$", "")
334334
items[#items + 1] = { key = name, label = label }
335335
end
336336
end

EllesmereUIBasics/EllesmereUIBasics.lua

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1460,6 +1460,14 @@ local function ApplyMinimap()
14601460

14611461
-- Border
14621462
local r, g, b = GetBorderColor(p)
1463+
-- Hide the circular quest area ring on square minimaps
1464+
if minimap.SetArchBlobRingScalar then
1465+
minimap:SetArchBlobRingScalar(isCircle and 1 or 0)
1466+
end
1467+
if minimap.SetQuestBlobRingScalar then
1468+
minimap:SetQuestBlobRingScalar(isCircle and 1 or 0)
1469+
end
1470+
14631471
if p.shape == "square" then
14641472
-- Square: pixel-perfect border
14651473
local bs = p.borderSize or 1

EllesmereUIBasics/EllesmereUIBasics.toc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
## Group: EllesmereUI
55
## Notes: Chat, Minimap, Friends List, Quest Tracker, and Cursor skinning
66
## Author: Ellesmere
7-
## Version: 6.2.1
7+
## Version: 6.2.2
88
## Dependencies: EllesmereUI
99
## SavedVariables: EllesmereUIBasicsDB
1010
## IconTexture: Interface\AddOns\EllesmereUI\media\eg-logo.tga

EllesmereUIBasics/EllesmereUIBasics_QuestTracker.lua

Lines changed: 39 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -346,12 +346,48 @@ local function TitleRowOnClick(self, btn)
346346
EQT:SetDirty(true)
347347
end
348348
end
349+
local function AuctionatorSearch()
350+
if not (Auctionator and Auctionator.API and Auctionator.API.v1 and Auctionator.API.v1.MultiSearchAdvanced) then return false end
351+
local ok, schematic = pcall(C_TradeSkillUI.GetRecipeSchematic, recipeID, false)
352+
if not ok or not schematic or not schematic.reagentSlotSchematics then return false end
353+
local searchTerms = {}
354+
for _, slot in ipairs(schematic.reagentSlotSchematics) do
355+
if slot.reagentType == 1 and slot.reagents and #slot.reagents > 0 then
356+
local needed = slot.quantityRequired or 1
357+
local owned = 0
358+
local itemID
359+
for _, reagent in ipairs(slot.reagents) do
360+
if reagent.itemID then
361+
itemID = itemID or reagent.itemID
362+
owned = owned + (C_Item.GetItemCount(reagent.itemID, true) or 0)
363+
end
364+
end
365+
if itemID and owned < needed then
366+
local name = C_Item.GetItemNameByID(itemID)
367+
if name then
368+
searchTerms[#searchTerms + 1] = { searchString = name, isExact = true }
369+
end
370+
end
371+
end
372+
end
373+
if #searchTerms > 0 then
374+
Auctionator.API.v1.MultiSearchAdvanced("EllesmereUI", searchTerms)
375+
return true
376+
end
377+
return false
378+
end
349379
if btn == "RightButton" then
350-
ShowContextMenu(self, {
380+
local menuItems = {
351381
{ text = "Untrack Recipe", onClick = UntrackRecipe },
352-
})
382+
}
383+
if Auctionator and Auctionator.API and Auctionator.API.v1 and Auctionator.API.v1.MultiSearchAdvanced then
384+
menuItems[#menuItems + 1] = { text = "Search AH (Auctionator)", onClick = AuctionatorSearch }
385+
end
386+
ShowContextMenu(self, menuItems)
353387
elseif IsShiftKeyDown() then
354-
UntrackRecipe()
388+
if not AuctionatorSearch() then
389+
UntrackRecipe()
390+
end
355391
end
356392
return
357393
end

EllesmereUICooldownManager/EllesmereUICooldownManager.toc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
## Group: EllesmereUI
55
## Notes: CDM look customization, action bar glows, and buff bars
66
## Author: Ellesmere
7-
## Version: 6.2.1
7+
## Version: 6.2.2
88
## Dependencies: EllesmereUI
99
## SavedVariables: EllesmereUICooldownManagerDB
1010
## IconTexture: Interface\AddOns\EllesmereUI\media\eg-logo.tga

EllesmereUINameplates/EllesmereUINameplates.toc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
## Group: EllesmereUI
55
## Notes: Custom Nameplate Design
66
## Author: Ellesmere
7-
## Version: 6.2.1
7+
## Version: 6.2.2
88
## Dependencies: EllesmereUI
99
## SavedVariables: EllesmereUINameplatesDB
1010
## IconTexture: Interface\AddOns\EllesmereUI\media\eg-logo.tga

0 commit comments

Comments
 (0)