From c648d656e296de4ffc5eb948e8f8f4903498a7ca Mon Sep 17 00:00:00 2001 From: "Johnny C. Lam" Date: Mon, 14 Jul 2014 15:31:37 -0400 Subject: [PATCH] Check for the presence of script controls in a more accurate way. The actual control widgets are stored in Ovale.checkBoxWidget and Ovale.listWidget, so see if those tables are empty or not. --- OvaleIcone.lua | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/OvaleIcone.lua b/OvaleIcone.lua index 92be2d6..30d1399 100644 --- a/OvaleIcone.lua +++ b/OvaleIcone.lua @@ -27,6 +27,10 @@ local tostring = tostring local API_GetTime = GetTime -- +local function HasScriptControls() + return (next(Ovale.checkBoxWidget) ~= nil or next(Ovale.listWidget) ~= nil) +end + -- local function SetValue(self, value, actionTexture) self.icone:Show() @@ -247,7 +251,7 @@ function OvaleIcone_OnMouseUp(self) end function OvaleIcone_OnEnter(self) - if self.help or next(Ovale.casesACocher) or next(Ovale.listes) or self.actionType then + if self.help or self.actionType or HasScriptControls() then GameTooltip:SetOwner(self, "ANCHOR_BOTTOMLEFT") if self.help then GameTooltip:SetText(L[self.help]) @@ -265,7 +269,7 @@ function OvaleIcone_OnEnter(self) end GameTooltip:AddLine(actionHelp, 0.5, 1, 0.75) end - if next(Ovale.casesACocher) or next(Ovale.listes) then + if HasScriptControls() then GameTooltip:AddLine(L["Cliquer pour afficher/cacher les options"], 1, 1, 1) end GameTooltip:Show() @@ -273,7 +277,7 @@ function OvaleIcone_OnEnter(self) end function OvaleIcone_OnLeave(self) - if self.help or next(Ovale.casesACocher) or next(Ovale.listes) then + if self.help or HasScriptControls() then GameTooltip:Hide() end end -- 1.7.9.5