From 2190c82d75085eec7cb052ed97742ebc8ce6eb15 Mon Sep 17 00:00:00 2001 From: pschifferer Date: Sat, 31 Oct 2009 14:22:41 +0000 Subject: [PATCH] Reordered the window opening sequence to address the situation where some systems have both windows open and visible at the same time. --- CauldronMainUI.lua | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/CauldronMainUI.lua b/CauldronMainUI.lua index 8036528..49b8ded 100644 --- a/CauldronMainUI.lua +++ b/CauldronMainUI.lua @@ -18,12 +18,6 @@ function Cauldron:Frame_Show() --@end-alpha@ CloseDropDownMenus(); - --@alpha@ - self:debug("Frame_Show: show our frame"); - --@end-alpha@ - ShowUIPanel(CauldronFrame); --- tinsert(UISpecialFrames, CauldronFrame:GetName()); - if TradeSkillFrame then -- place our frame over the original frame -- CauldronFrame:SetPoint("TOPLEFT", TradeSkillFrame:GetLeft(), TradeSkillFrame:GetTop()); @@ -33,8 +27,12 @@ function Cauldron:Frame_Show() --@end-alpha@ -- hide the original tradeskill frame - Cauldron.vars.origFrameStrata = TradeSkillFrame:GetFrameStrata(); - Cauldron.vars.origFrameLevel = TradeSkillFrame:GetFrameLevel(); + if not Cauldron.vars.origFrameStrata then + Cauldron.vars.origFrameStrata = TradeSkillFrame:GetFrameStrata(); + end + if not Cauldron.vars.origFrameLevel then + Cauldron.vars.origFrameLevel = TradeSkillFrame:GetFrameLevel(); + end TradeSkillFrame:SetAlpha(0); TradeSkillFrame:ClearAllPoints(); @@ -55,6 +53,12 @@ function Cauldron:Frame_Show() end + --@alpha@ + self:debug("Frame_Show: show our frame"); + --@end-alpha@ + ShowUIPanel(CauldronFrame); +-- tinsert(UISpecialFrames, CauldronFrame:GetName()); + self:RegisterMessage("Cauldron_Update", "OnCauldronUpdate"); --@alpha@ -- 1.7.9.5