diff --git a/MoveAnything/MoveAnythingVirtualMovers.xml b/MoveAnything/MoveAnythingVirtualMovers.xml index ed24ed1..91b724e 100644 --- a/MoveAnything/MoveAnythingVirtualMovers.xml +++ b/MoveAnything/MoveAnythingVirtualMovers.xml @@ -1460,23 +1460,59 @@ self.OnMAHook = function(self) self.attachedChildren = {} - local b = _G["BuffFrame"] - b:SetPoint("TOPRIGHT", self, "TOPRIGHT", 0, 0) - MovAny:LockPoint(b) - tinsert(self.attachedChildren, b) - b = _G["ConsolidatedBuffs"] - b:SetPoint("TOPRIGHT", self, "TOPRIGHT", 0, 0) - MovAny:LockPoint(b) - tinsert(self.attachedChildren, b) + + local consolidatedBuffs = _G["ConsolidatedBuffs"] + if consolidatedBuffs then + consolidatedBuffs:SetPoint( + "TOPRIGHT", + self, + "TOPRIGHT", + 0, 0) + MovAny:LockPoint(consolidatedBuffs) + tinsert(self.attachedChildren, consolidatedBuffs) + end + + local vanityBuffs = _G["VanityBuffs"] + if vanityBuffs then + vanityBuffs:SetPoint( + "TOPRIGHT", + consolidatedBuffs or self, + "TOPLEFT", + -6, 0) + MovAny:LockPoint(vanityBuffs) + tinsert(self.attachedChildren, vanityBuffs) + end + + local buffFrame = _G["BuffFrame"] + if buffFrame then + local anchorFrame = vanityBuffs or consolidatedBuffs or self + buffFrame:SetPoint( + "TOPRIGHT", + anchorFrame, + "TOPLEFT", + -6, 0) + MovAny:LockPoint(buffFrame) + tinsert(self.attachedChildren, buffFrame) + end + self:Show() end self.OnMAPostReset = function(self) - local b = _G["BuffFrame"] - MovAny:UnlockPoint(b) - b:SetPoint("TOPRIGHT", UIParent, "TOPRIGHT", -205, -13) - b = _G["ConsolidatedBuffs"] - MovAny:UnlockPoint(b) - b:SetPoint("TOPRIGHT", UIParent, "TOPRIGHT", -180, -13) + + local buffFrame = _G["BuffFrame"] + MovAny:UnlockPoint(buffFrame) + buffFrame:SetPoint("TOPRIGHT", UIParent, "TOPRIGHT", -205, -13) + + local consolidatedBuffs = _G["ConsolidatedBuffs"] + MovAny:UnlockPoint(consolidatedBuffs) + consolidatedBuffs:SetPoint("TOPRIGHT", UIParent, "TOPRIGHT", -180, -13) + + local vanityBuffs = _G["VanityBuffs"] + if vanityBuffs then + MovAny:UnlockPoint(vanityBuffs) + vanityBuffs:SetPoint("TOPRIGHT", consolidatedBuffs, "TOPRIGHT", -6, 0) + end + self:Hide() end