beta
This commit is contained in:
@@ -376,11 +376,7 @@ local function SetRegionAlpha(self, alpha)
|
||||
end
|
||||
|
||||
self.alpha = alpha;
|
||||
if (WeakAuras.IsOptionsOpen()) then
|
||||
self:SetAlpha(max(self.animAlpha or self.alpha or 1, 0.5));
|
||||
else
|
||||
self:SetAlpha(self.animAlpha or self.alpha or 1);
|
||||
end
|
||||
self:SetAlpha(self.animAlpha or self.alpha or 1);
|
||||
self.subRegionEvents:Notify("AlphaChanged")
|
||||
end
|
||||
|
||||
@@ -496,6 +492,10 @@ function WeakAuras.regionPrototype.modify(parent, region, data)
|
||||
if (defaultsForRegion and defaultsForRegion.alpha) then
|
||||
region:SetRegionAlpha(data.alpha);
|
||||
end
|
||||
if region.SetRegionAlpha then
|
||||
region:SetRegionAlpha(data.alpha)
|
||||
end
|
||||
|
||||
local hasAdjustedMin = defaultsForRegion and defaultsForRegion.useAdjustededMin ~= nil and data.useAdjustededMin
|
||||
and data.adjustedMin;
|
||||
local hasAdjustedMax = defaultsForRegion and defaultsForRegion.useAdjustededMax ~= nil and data.useAdjustededMax
|
||||
@@ -709,12 +709,13 @@ end
|
||||
|
||||
-- Expand/Collapse function
|
||||
function WeakAuras.regionPrototype.AddExpandFunction(data, region, cloneId, parent, parentRegionType)
|
||||
local uid = data.uid
|
||||
local id = data.id
|
||||
local inDynamicGroup = parentRegionType == "dynamicgroup";
|
||||
local inGroup = parentRegionType == "group";
|
||||
|
||||
local startMainAnimation = function()
|
||||
Private.Animate("display", data.uid, "main", data.animation.main, region, false, nil, true, cloneId);
|
||||
Private.Animate("display", uid, "main", data.animation.main, region, false, nil, true, cloneId);
|
||||
end
|
||||
|
||||
function region:OptionsClosed()
|
||||
@@ -739,7 +740,8 @@ function WeakAuras.regionPrototype.AddExpandFunction(data, region, cloneId, pare
|
||||
region:PreHide()
|
||||
end
|
||||
|
||||
Private.RunConditions(region, id, true)
|
||||
Private.RunConditions(region, uid, true)
|
||||
region.subRegionEvents:Notify("PreHide")
|
||||
region:Hide();
|
||||
if (cloneId) then
|
||||
Private.ReleaseClone(region.id, cloneId, data.regionType);
|
||||
@@ -753,7 +755,8 @@ function WeakAuras.regionPrototype.AddExpandFunction(data, region, cloneId, pare
|
||||
if region.PreHide then
|
||||
region:PreHide()
|
||||
end
|
||||
Private.RunConditions(region, id, true)
|
||||
Private.RunConditions(region, uid, true)
|
||||
region.subRegionEvents:Notify("PreHide")
|
||||
region:Hide();
|
||||
if (cloneId) then
|
||||
Private.ReleaseClone(region.id, cloneId, data.regionType);
|
||||
|
||||
Reference in New Issue
Block a user