diff --git a/Dominos/Dominos.toc b/Dominos/Dominos.toc index 0c10c2b..2543cff 100644 --- a/Dominos/Dominos.toc +++ b/Dominos/Dominos.toc @@ -42,7 +42,7 @@ bars\menuBar.lua bars\petBar.lua bars\petBar.classic.lua bars\possessBar.lua -# bars\queueStatusBar.lua +bars\queueStatusBar.lua bars\stanceBar.lua bars\stanceBar.classic.lua bars\talkingHeadBar.lua diff --git a/Dominos/bars/bagBar.lua b/Dominos/bars/bagBar.lua index 9cc830a..c600767 100644 --- a/Dominos/bars/bagBar.lua +++ b/Dominos/bars/bagBar.lua @@ -3,8 +3,6 @@ -------------------------------------------------------------------------------- local AddonName, Addon = ... -if Addon:IsBuild("retail") then return end - local L = LibStub("AceLocale-3.0"):GetLocale(AddonName) -- register buttons for use later @@ -184,6 +182,10 @@ function BagBarModule:Unload() end function BagBarModule:OnFirstLoad() + if BagsBar then + BagsBar:SetParent(Addon.ShadowUIParent) + end + -- use our own handlign for the blizzard bag bar if MainMenuBarManager then EventRegistry:UnregisterCallback("MainMenuBarManager.OnExpandChanged", MainMenuBarManager) diff --git a/Dominos/bars/menuBar.lua b/Dominos/bars/menuBar.lua index 4840255..85fcdf2 100644 --- a/Dominos/bars/menuBar.lua +++ b/Dominos/bars/menuBar.lua @@ -6,25 +6,27 @@ -------------------------------------------------------------------------------- local AddonName, Addon = ... -if Addon:IsBuild("retail") then return end - local L = LibStub('AceLocale-3.0'):GetLocale(AddonName) local MicroButtons = {} local PetMicroButtonFrame = PetBattleFrame and PetBattleFrame.BottomFrame.MicroButtonFrame if MicroMenu then - local function registerButtons(...) + local function registerButtons(t, ...) for i = 1, select('#', ...) do local button = select(i, ...) + -- always reparent the button + button:SetParent(Addon.ShadowUIParent) + + -- ...but only display it on our bar if it was already enabled if button:IsShown() then - MicroButtons[#MicroButtons + 1] = button + t[#t + 1] = button end end end - registerButtons(MicroMenu:GetChildren()) + registerButtons(MicroButtons, MicroMenu:GetChildren()) else local MICRO_BUTTONS = _G.MICRO_BUTTONS or { "CharacterMicroButton", @@ -335,14 +337,31 @@ function MenuBarModule:OnFirstLoad() hooksecurefunc("UpdateMicroButtons", layout) + -- ensure that the micro menu remains banished + -- otherwise, it'll try laying itself out again and trigger an error + if MicroMenu then + MicroMenu:SetParent(Addon.ShadowUIParent) + + hooksecurefunc(MicroMenu, "SetParent", function(menu, parent) + if parent == MicroMenuContainer then + menu:SetParent(Addon.ShadowUIParent) + end + end) + end + + -- banish the micro menu container + if MicroMenuContainer then + MicroMenuContainer:SetParent(Addon.ShadowUIParent) + end + if OverrideActionBar then - local f = CreateFrame('Frame', nil, OverrideActionBar) + local f = CreateFrame("Frame", nil, OverrideActionBar) f:SetScript("OnShow", layout) f:SetScript("OnHide", layout) end if PetMicroButtonFrame then - local f = CreateFrame('Frame', nil, PetMicroButtonFrame) + local f = CreateFrame("Frame", nil, PetMicroButtonFrame) f:SetScript("OnShow", layout) f:SetScript("OnHide", layout) end diff --git a/changelog.md b/changelog.md index 4263ceb..acf3a94 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,9 @@ # Dominos Changelog +## 10.2.24 + +* (Retail) Restored the menu, bags and queue status bars + ## 10.2.23 * Updated TOC file versions for 10.2.6