From 2baa80131eafbae5bbe2617a6d3423d1fafcca9f Mon Sep 17 00:00:00 2001 From: torhal Date: Sun, 22 Nov 2009 06:16:08 +0000 Subject: [PATCH] In addon:Scan(): Change the existence/visibility check for TradeSkillFrame to be a a check on the scan button's parent instead - TradeSkillFrame will not be visible when using a replacement AddOn. The ScrollFrame will no longer refresh its contents when scrolling. --- AckisRecipeList.lua | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/AckisRecipeList.lua b/AckisRecipeList.lua index 2999a82..c3985e7 100644 --- a/AckisRecipeList.lua +++ b/AckisRecipeList.lua @@ -389,7 +389,7 @@ function addon:OnInitialize() ------------------------------------------------------------------------------- -- Create the scan button, then set its parent and scripts. ------------------------------------------------------------------------------- - local scan_button = CreateFrame("Button", "ARL_ScanButton", UIParent, "UIPanelButtonTemplate") + local scan_button = CreateFrame("Button", nil, UIParent, "UIPanelButtonTemplate") -- Add to Skillet interface if Skillet and Skillet:IsActive() then @@ -460,7 +460,7 @@ function addon:OnInitialize() scan_button:SetFrameLevel(framelevel + 1) scan_button:SetFrameStrata(framestrata) scan_button:Enable() - self.ScanButton = scan_button + self.scan_button = scan_button ------------------------------------------------------------------------------- -- Populate the profession initialization functions. @@ -733,7 +733,7 @@ do if Skillet then return end - local scan_button = self.ScanButton + local scan_button = self.scan_button if ATSWFrame then scan_button:SetParent(ATSWFrame) @@ -766,7 +766,7 @@ do elseif loc == "BL" then scan_button:SetPoint("TOP",TradeSkillCreateAllButton,"BOTTOM",0,-5) end - scan_button:SetWidth(addon.ScanButton:GetTextWidth() + 10) + scan_button:SetWidth(addon.scan_button:GetTextWidth() + 10) end scan_button:Show() end @@ -778,7 +778,7 @@ function addon:TRADE_SKILL_CLOSE() end if not Skillet then - addon.ScanButton:Hide() + addon.scan_button:Hide() end end @@ -1447,11 +1447,14 @@ do -- @param textdump Boolean indicating if we want the output to be a text dump, or if we want to use the ARL GUI. -- @return A frame with either the text dump, or the ARL frame. function addon:Scan(textdump) - if not TradeSkillFrame or not TradeSkillFrame:IsVisible() then + local scan_parent = self.scan_button:GetParent() + + -- The scan button is re-parented to whichever interface it's anchored to, whether it's TradeSkillFrame or a replacement AddOn, + -- so we make sure its parent exists and is visible before proceeding. + if not scan_parent or not scan_parent:IsVisible() then self:Print(L["OpenTradeSkillWindow"]) return end - -- Get the name of the currently opened trade skill, along with the current level of the skill. Player["Profession"], Player["ProfessionLevel"] = GetTradeSkillLine() -- Get the current profession Specialty -- 1.7.9.5