Provide the option to suppress lua call in setText

This commit is contained in:
BenDol
2014-04-03 05:20:35 +13:00
parent d45fbcb10f
commit 1074b6b787
4 changed files with 24 additions and 8 deletions

View File

@@ -14,7 +14,8 @@ function init()
onSpellGroupCooldown = onSpellGroupCooldown,
onSpellCooldown = onSpellCooldown })
cooldownButton = modules.client_topmenu.addRightGameToggleButton('cooldownButton', tr('Cooldowns'), '/images/topbuttons/cooldowns', toggle)
cooldownButton = modules.client_topmenu.addRightGameToggleButton('cooldownButton',
tr('Cooldowns'), '/images/topbuttons/cooldowns', toggle)
cooldownButton:setOn(true)
cooldownButton:hide()
@@ -47,6 +48,7 @@ end
function loadIcon(iconId)
local spell, profile, spellName = Spells.getSpellByIcon(iconId)
if not spellName then return end
if not profile then return end
clientIconId = Spells.getClientId(spellName)
if not clientIconId then return end
@@ -57,8 +59,13 @@ function loadIcon(iconId)
icon:setId(iconId)
end
icon:setImageSource(SpelllistSettings[profile].iconFile)
icon:setImageClip(Spells.getImageClip(clientIconId, profile))
local spellSettings = SpelllistSettings[profile]
if spellSettings then
icon:setImageSource(spellSettings.iconFile)
icon:setImageClip(Spells.getImageClip(clientIconId, profile))
else
icon = nil
end
return icon
end
@@ -133,7 +140,10 @@ function updateCooldown(progressRect, duration)
if progressRect:getPercent() < 100 then
removeEvent(progressRect.event)
progressRect.event = scheduleEvent(function() progressRect.callback[ProgressCallback.update]() end, 100)
progressRect.event = scheduleEvent(function()
progressRect.callback[ProgressCallback.update]()
end, 100)
else
progressRect.callback[ProgressCallback.finish]()
end