# HG changeset patch # User Nenue # Date 1483318595 18000 # Node ID 43303398d1b907107de156a8c814653305200874 # Parent df10cd0ae949cf5c9b5856661784abf0b607bfa6 - Pre-load veneer frames for buffs, set their triggers when the appropriate frames have spawned. - Add border frames into the PETBATTLES frame lock table so they are hidden properly. Normal triggers don't work here. diff -r df10cd0ae949 -r 43303398d1b9 Modules/BuffFrame.lua --- a/Modules/BuffFrame.lua Sun Jan 01 19:31:06 2017 -0500 +++ b/Modules/BuffFrame.lua Sun Jan 01 19:56:35 2017 -0500 @@ -180,10 +180,14 @@ function Facade:OnShow() + print(self:GetName(), 'OnShow') self.underlay:Show() end function Facade:OnHide() + + print(self:GetName(), 'OnHide') self.underlay:Hide() + end function Facade:OnLoad() @@ -239,12 +243,15 @@ (ANCHOR_INSET_DELTA[COUNT_ANCHOR][1] * COUNT_INSET), (ANCHOR_INSET_DELTA[COUNT_ANCHOR][2] * COUNT_INSET)) - self.underlay:SetParent(self) + self.underlay:SetParent(UIParent) + self.underlay:SetFrameStrata('BACKGROUND') self.border:SetColorTexture(0,0,0,1) self.border:SetPoint('TOPLEFT', self, 'TOPLEFT', -BORDER_SIZE_L, BORDER_SIZE_U) self.border:SetPoint('BOTTOMRIGHT', self, 'BOTTOMRIGHT', BORDER_SIZE_R, -BORDER_SIZE_D) self.border:Show() + + FRAMELOCK_STATES.PETBATTLES[self.underlay:GetName()] = "hidden" end function plugin:AcquireConfigButton(name) @@ -300,7 +307,7 @@ function plugin:SetupButton (name) local frame = _G[name] - --print('|cFFFFFF00Adopting', name) + print('|cFFFFFF00Adopting', name) local icon = _G[name .. 'Icon'] local border = _G[name .. 'Border'] @@ -339,17 +346,22 @@ duration:ClearAllPoints() end - hooksecurefunc(frame, "Hide", function(self) + hooksecurefunc(frame, "Hide", function(frame) veneer:Hide() end) - hooksecurefunc(frame, 'Show', function(self) + hooksecurefunc(frame, 'Show', function(frame) veneer:Show() end) + hooksecurefunc(frame, 'SetShown', function(frame, isShown) + veneer:SetShown(isShown) + end) + + veneer:SetParent(UIParent) veneer:SetAllPoints(frame) - veneer:SetFrameStrata('BACKGROUND') + veneer:SetFrameStrata('MEDIUM') end diff -r df10cd0ae949 -r 43303398d1b9 Modules/BuffFrame.xml --- a/Modules/BuffFrame.xml Sun Jan 01 19:31:06 2017 -0500 +++ b/Modules/BuffFrame.xml Sun Jan 01 19:56:35 2017 -0500 @@ -10,7 +10,7 @@ - +