Exiles/coa-weakauras
3
0
Fork 0
Code Pull Requests Actions Packages Releases 2 Wiki Activity

beta

Browse Source
This commit is contained in:
Bunny67
2020-08-06 17:41:52 +03:00
parent 5a7277a5a3
commit 969ef6edf8
16 changed files with 221 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WeakAuras/RegionTypes/DynamicGroup.lua
+6 -3
View File
@@ -1025,7 +1025,7 @@ local function modify(parent, region, data)
self.needToPosition = false
if #self.sortedChildren > 0 then
if animate then
Private.RegisterGroupForPositioning(data.id, self)
Private.RegisterGroupForPositioning(data.uid, self)
else
self:DoPositionChildren()
end
@@ -1044,7 +1044,10 @@ local function modify(parent, region, data)
type(pos[2]) == "number" and pos[2] or 0,
type(pos[3]) ~= "boolean" and true or pos[3]
local controlPoint = regionData.controlPoint
local controlPoint = type(regionData) == "table" and regionData.controlPoint
if not controlPoint then
break
end
controlPoint:ClearAnchorPoint()
controlPoint:SetAnchorPoint(
data.selfPoint,
@@ -1134,7 +1137,7 @@ local function modify(parent, region, data)
}
end
-- update animated expand & collapse for this child
WeakAuras.Animate("controlPoint", data, "controlPoint", anim, regionData.controlPoint, true)
WeakAuras.Animate("controlPoint", data.uid, "controlPoint", anim, regionData.controlPoint, true)
end
end
regionData.xOffset = x
WeakAuras/RegionTypes/RegionPrototype.lua
+6 -9
View File
@@ -265,10 +265,7 @@ end
local function RunCode(self, func)
if func and not WeakAuras.IsOptionsOpen() then
WeakAuras.ActivateAuraEnvironment(self.id, self.cloneId, self.state, self.states);
local ok, ret = pcall(func);
if not ok then
geterrorhandler()(ret)
end
xpcall(func, geterrorhandler());
WeakAuras.ActivateAuraEnvironment(nil);
end
end
@@ -716,7 +713,7 @@ function WeakAuras.regionPrototype.AddExpandFunction(data, region, cloneId, pare
local inGroup = parentRegionType == "group";
local startMainAnimation = function()
WeakAuras.Animate("display", data, "main", data.animation.main, region, false, nil, true, cloneId);
WeakAuras.Animate("display", data.uid, "main", data.animation.main, region, false, nil, true, cloneId);
end
function region:OptionsClosed()
@@ -772,7 +769,7 @@ function WeakAuras.regionPrototype.AddExpandFunction(data, region, cloneId, pare
region:SetScript("OnUpdate", nil)
WeakAuras.PerformActions(data, "finish", region);
if (not WeakAuras.Animate("display", data, "finish", data.animation.finish, region, false, hideRegion, nil, cloneId)) then
if (not WeakAuras.Animate("display", data.uid, "finish", data.animation.finish, region, false, hideRegion, nil, cloneId)) then
hideRegion();
end
@@ -797,7 +794,7 @@ function WeakAuras.regionPrototype.AddExpandFunction(data, region, cloneId, pare
WeakAuras.ApplyFrameLevel(region)
region:Show();
WeakAuras.PerformActions(data, "start", region);
if not(WeakAuras.Animate("display", data, "start", data.animation.start, region, true, startMainAnimation, nil, cloneId)) then
if not(WeakAuras.Animate("display", data.uid, "start", data.animation.start, region, true, startMainAnimation, nil, cloneId)) then
startMainAnimation();
end
parent:ActivateChild(data.id, cloneId);
@@ -814,7 +811,7 @@ function WeakAuras.regionPrototype.AddExpandFunction(data, region, cloneId, pare
region:SetScript("OnUpdate", nil)
WeakAuras.PerformActions(data, "finish", region);
if (not WeakAuras.Animate("display", data, "finish", data.animation.finish, region, false, hideRegion, nil, cloneId)) then
if (not WeakAuras.Animate("display", data.uid, "finish", data.animation.finish, region, false, hideRegion, nil, cloneId)) then
hideRegion();
end
@@ -851,7 +848,7 @@ function WeakAuras.regionPrototype.AddExpandFunction(data, region, cloneId, pare
WeakAuras.ApplyFrameLevel(region)
region:Show();
WeakAuras.PerformActions(data, "start", region);
if not(WeakAuras.Animate("display", data, "start", data.animation.start, region, true, startMainAnimation, nil, cloneId)) then
if not(WeakAuras.Animate("display", data.uid, "start", data.animation.start, region, true, startMainAnimation, nil, cloneId)) then
startMainAnimation();
end