This commit is contained in:
Bunny67
2020-09-14 10:12:22 +03:00
parent 6c3f9d925e
commit 0f4f16b6f0
71 changed files with 2302 additions and 2431 deletions
+8 -8
View File
@@ -75,7 +75,7 @@ local function modify(parent, region, data)
WeakAuras.regionPrototype.modify(parent, region, data);
local text = region.text;
region.useAuto = WeakAuras.CanHaveAuto(data);
region.useAuto = Private.CanHaveAuto(data);
local fontPath = SharedMedia:Fetch("font", data.font);
text:SetFont(fontPath, data.fontSize < 33 and data.fontSize or 33, data.outline);
@@ -158,7 +158,7 @@ local function modify(parent, region, data)
end
local UpdateText
if WeakAuras.ContainsAnyPlaceHolders(data.displayText) then
if Private.ContainsAnyPlaceHolders(data.displayText) then
local getter = function(key, default)
local fullKey = "displayText_format_" .. key
if (data[fullKey] == nil) then
@@ -166,10 +166,10 @@ local function modify(parent, region, data)
end
return data[fullKey]
end
local formatters = WeakAuras.CreateFormatters(data.displayText, getter)
local formatters = Private.CreateFormatters(data.displayText, getter)
UpdateText = function()
local textStr = data.displayText;
textStr = WeakAuras.ReplacePlaceHolders(textStr, region, nil, false, formatters);
textStr = Private.ReplacePlaceHolders(textStr, region, nil, false, formatters);
if (textStr == nil or textStr == "") then
textStr = " ";
end
@@ -179,7 +179,7 @@ local function modify(parent, region, data)
end
local customTextFunc = nil
if(WeakAuras.ContainsCustomPlaceHolder(data.displayText) and data.customText) then
if(Private.ContainsCustomPlaceHolder(data.displayText) and data.customText) then
customTextFunc = WeakAuras.LoadFunction("return "..data.customText, region.id, "custom text")
end
@@ -187,7 +187,7 @@ local function modify(parent, region, data)
if customTextFunc then
if UpdateText then
Update = function()
region.values.custom = WeakAuras.RunCustomTextFunc(region, customTextFunc)
region.values.custom = Private.RunCustomTextFunc(region, customTextFunc)
UpdateText()
end
end
@@ -196,14 +196,14 @@ local function modify(parent, region, data)
end
local TimerTick
if WeakAuras.ContainsPlaceHolders(data.displayText, "p") then
if Private.ContainsPlaceHolders(data.displayText, "p") then
TimerTick = UpdateText
end
local FrameTick
if customTextFunc and data.customTextUpdate == "update" then
FrameTick = function()
region.values.custom = WeakAuras.RunCustomTextFunc(region, customTextFunc)
region.values.custom = Private.RunCustomTextFunc(region, customTextFunc)
UpdateText()
end
end