diff --git a/ElvUI/Core/StaticPopups.lua b/ElvUI/Core/StaticPopups.lua index 80f9832..a8f0fa9 100644 --- a/ElvUI/Core/StaticPopups.lua +++ b/ElvUI/Core/StaticPopups.lua @@ -766,6 +766,8 @@ function E:StaticPopup_Resize(dialog, which) height = height + 8 + editBox:GetHeight() elseif info.hasMoneyFrame then height = height + 16 + elseif info.hasMoneyInputFrame then + height = height + 22 end if height > maxHeightSoFar then @@ -903,6 +905,13 @@ function E:StaticPopup_Show(which, text_arg1, text_arg2, data) _G[name.."MoneyFrame"]:Hide() end + -- Show or hide money input frame + if info.hasMoneyInputFrame then + _G[name.."MoneyInputFrame"]:Show() + else + _G[name.."MoneyInputFrame"]:Hide() + end + -- Set the miscellaneous variables for the dialog dialog.which = which dialog.timeleft = info.timeout diff --git a/ElvUI/Core/tutorials.lua b/ElvUI/Core/tutorials.lua index ef038fe..48b90cf 100644 --- a/ElvUI/Core/tutorials.lua +++ b/ElvUI/Core/tutorials.lua @@ -13,7 +13,6 @@ E.TutorialList = { L["You can toggle the microbar by using your middle mouse button on the minimap you can also accomplish this by enabling the actual microbar located in the actionbar settings."], L["A raid marker feature is available by pressing Escape -> Keybinds scroll to the bottom under ElvUI and setting a keybind for the raid marker."], L["You can set your keybinds quickly by typing /kb."], - L["The focus unit can be set by typing /focus when you are targeting the unit you want to focus. It is recommended you make a macro to do this."], L["ElvUI has a dual spec feature which allows you to load different profiles based on your current spec on the fly. You can enable this from the profiles tab."], L["You can access copy chat and chat menu functions by mouse over the top right corner of chat panel and left/right click on the button that will appear."], L["If you are experiencing issues with ElvUI try disabling all your addons except ElvUI, remember ElvUI is a full UI replacement addon, you cannot run two addons that do the same thing."], diff --git a/ElvUI/Modules/Auras/Auras.lua b/ElvUI/Modules/Auras/Auras.lua index 5d27cd3..fb22131 100644 --- a/ElvUI/Modules/Auras/Auras.lua +++ b/ElvUI/Modules/Auras/Auras.lua @@ -308,7 +308,7 @@ function A:ConfigureAuras(header, auraTable, weaponPosition) top = max(top, button:GetTop() or -huge) bottom = min(bottom, button:GetBottom() or huge) end - local deadIndex = (getn(auraTable) + numWeapon) + 1 + local deadIndex = getn(auraTable) + 1 button = _G[headerName.."AuraButton"..deadIndex] while button do if button:IsShown() then button:Hide() end diff --git a/ElvUI/Modules/Blizzard/WatchFrame.lua b/ElvUI/Modules/Blizzard/WatchFrame.lua index 6831938..d70c239 100644 --- a/ElvUI/Modules/Blizzard/WatchFrame.lua +++ b/ElvUI/Modules/Blizzard/WatchFrame.lua @@ -7,6 +7,40 @@ local min = math.min --WoW API / Variables local hooksecurefunc = hooksecurefunc local GetScreenHeight = GetScreenHeight +local GetNumQuestWatches = GetNumQuestWatches +local GetQuestIndexForWatch = GetQuestIndexForWatch +local RemoveQuestWatch = RemoveQuestWatch +local AddQuestWatch = AddQuestWatch +local QuestWatch_Update = QuestWatch_Update + +local original_QuestWatch_Update = QuestWatch_Update +function _G.QuestWatch_Update() + local watched = {} + local order = {} + local hasDuplicates = false + for i = 1, GetNumQuestWatches() do + local qIndex = GetQuestIndexForWatch(i) + if qIndex then + if watched[qIndex] then + hasDuplicates = true + else + watched[qIndex] = true + table.insert(order, qIndex) + end + end + end + + if hasDuplicates then + for i = 1, table.getn(order) do + RemoveQuestWatch(order[i]) + end + for i = 1, table.getn(order) do + AddQuestWatch(order[i]) + end + end + + original_QuestWatch_Update() +end local WatchFrameHolder = CreateFrame("Frame", "WatchFrameHolder", E.UIParent) WatchFrameHolder:SetWidth(150) diff --git a/README.md b/README.md index 0d9e996..a0692fa 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,10 @@ # This repository is actively being fixed and maintained by Bluewhale. ## Changelog +- **Fix:** Corrected bug in `Auras.lua` where unused buff icons remained visible on screen due to improper `deadIndex` calculation. +- **Fix:** Fixed quest tracker duplicating entries by overriding `QuestWatch_Update` to deduplicate quests manually. +- **Fix:** Hid the unwanted `MoneyInputFrame` from appearing over `StaticPopup` dialogs (like the UI Reload prompt) by updating custom popup handling. +- **Fix:** Removed false tutorial text referencing a non-existent `/focus` command. - **Fix:** Corrected Vanilla WoW (1.12) `UnitBuff` and `UnitDebuff` API parsing in `BuffIndicator` and `oUF_RaidDebuffs` to prevent missing textures and improper debuff filtering. - **Fix:** Removed implicit `arg` table leak in `hooksecurefunc` (varargs `...` issue in Lua 5.0). - **Fix:** Stripped invisible UTF-8 BOM from `utf8data.lua` that caused Lua parser errors.