From 83b6f7bbcaa3383d8dbcdba91e2a6cc90bc1f762 Mon Sep 17 00:00:00 2001 From: ackis Date: Thu, 12 Feb 2009 20:26:51 +0000 Subject: [PATCH] Make the pop-ups windows hide when we close the ARL window or we cycle to another profession. --- ARLFrame.lua | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/ARLFrame.lua b/ARLFrame.lua index ce54e3d..3ab5b7f 100644 --- a/ARLFrame.lua +++ b/ARLFrame.lua @@ -175,6 +175,11 @@ StaticPopupDialogs["ARL_ALLEXCLUDED"] = { function addon:CloseWindow() + -- Close all possible pop-up windows + StaticPopup_Hide("ARL_NOTSCANNED") + StaticPopup_Hide("ARL_ALLFILTERED") + StaticPopup_Hide("ARL_ALLKNOWN") + StaticPopup_Hide("ARL_ALLEXCLUDED") addon.Frame:Hide() end @@ -1585,7 +1590,6 @@ function addon.ToggleFilters() if (addon.Frame._Expanded == true) then -- Adjust the frame size and texture --- addon.Frame:Hide() addon.Frame:ClearAllPoints() addon.Frame:SetWidth(293) addon.Frame:SetHeight(447) @@ -1614,13 +1618,9 @@ function addon.ToggleFilters() ARL_ResetButton:Hide() ARL_ApplyButton:Hide() - - -- and finally, show our frame --- addon.Frame:Show() else -- Adjust the frame size and texture --- addon.Frame:Hide() addon.Frame:ClearAllPoints() addon.Frame:SetWidth(444) addon.Frame:SetHeight(447) @@ -1646,7 +1646,6 @@ function addon.ToggleFilters() ARL_ApplyButton:Show() -- and finally, show our frame --- addon.Frame:Show() end -- Reset our title @@ -2000,6 +1999,12 @@ function addon:SwitchProfs(button) local endLoop = 0 local displayProf = 0 + -- Close all possible pop-up windows + StaticPopup_Hide("ARL_NOTSCANNED") + StaticPopup_Hide("ARL_ALLFILTERED") + StaticPopup_Hide("ARL_ALLKNOWN") + StaticPopup_Hide("ARL_ALLEXCLUDED") + -- ok, so first off, if we've never done this before, there is no "current" -- and a single iteration will do nicely, thank you if button == "LeftButton" then @@ -3412,6 +3417,11 @@ function addon:CreateFrame( local ARL_CloseXButton = CreateFrame("Button", "ARL_CloseXButton", addon.Frame, "UIPanelCloseButton") ARL_CloseXButton:SetScript("OnClick", function(this) + -- Close all possible pop-up windows + StaticPopup_Hide("ARL_NOTSCANNED") + StaticPopup_Hide("ARL_ALLFILTERED") + StaticPopup_Hide("ARL_ALLKNOWN") + StaticPopup_Hide("ARL_ALLEXCLUDED") this:GetParent():Hide() end ) @@ -3562,6 +3572,11 @@ function addon:CreateFrame( "GameFontHighlightSmall", L["Close"], "CENTER", L["CLOSE_DESC"], 1) ARL_CloseButton:SetScript("OnClick", function(this) + -- Close all possible pop-up windows + StaticPopup_Hide("ARL_NOTSCANNED") + StaticPopup_Hide("ARL_ALLFILTERED") + StaticPopup_Hide("ARL_ALLKNOWN") + StaticPopup_Hide("ARL_ALLEXCLUDED") this:GetParent():Hide() end ) -- 1.7.9.5