from retail
This commit is contained in:
@@ -96,7 +96,7 @@ local properties = {
|
||||
min = 1,
|
||||
softMax = screenWidth,
|
||||
bigStep = 1,
|
||||
defautl = 32,
|
||||
default = 32,
|
||||
},
|
||||
height = {
|
||||
display = L["Height"],
|
||||
|
||||
@@ -163,7 +163,7 @@ end
|
||||
local sortNilFirst = WeakAuras.InvertSort(WeakAuras.SortNilLast)
|
||||
function WeakAuras.SortNilFirst(a, b)
|
||||
if a == nil and b == nil then
|
||||
-- we want SortNil to always prevent nils from propogating
|
||||
-- we want SortNil to always prevent nils from propagating
|
||||
-- as well as to sort nils onto one side
|
||||
-- to maintain stability, we need SortNil(nil, nil) to always be false
|
||||
-- hence this special case
|
||||
@@ -778,8 +778,8 @@ local function modify(parent, region, data)
|
||||
end
|
||||
|
||||
function region:Suspend()
|
||||
-- Stops group from repositioning and reindexing children
|
||||
-- Calls to Activate, Deactivate, and Reindex will cache the relevant children
|
||||
-- Stops group from repositioning and re-indexing children
|
||||
-- Calls to Activate, Deactivate, and Re-index will cache the relevant children
|
||||
-- Similarly, Sort, Position, and Resize will be stopped
|
||||
-- to be called on the next Resume
|
||||
-- for when the group is resumed
|
||||
|
||||
@@ -133,9 +133,9 @@ local function AcquireModel(region, data)
|
||||
-- Enable model animation
|
||||
if(data.advance) then
|
||||
local elapsed = 0;
|
||||
model:SetScript("OnUpdate", function(self, e)
|
||||
model:SetScript("OnUpdate", function(self, elaps)
|
||||
WeakAuras.StartProfileSystem("model");
|
||||
elapsed = elapsed + (e * 1000);
|
||||
elapsed = elapsed + (elaps * 1000);
|
||||
model:SetSequenceTime(data.sequence, elapsed);
|
||||
WeakAuras.StopProfileSystem("model");
|
||||
end)
|
||||
|
||||
@@ -52,12 +52,12 @@ end
|
||||
-- Adjusted Duration
|
||||
|
||||
function WeakAuras.regionPrototype.AddAdjustedDurationToDefault(default)
|
||||
default.useAdjustededMax = false;
|
||||
default.useAdjustededMin = false;
|
||||
default.useAdjustedMax = false;
|
||||
default.useAdjustedMin = false;
|
||||
end
|
||||
|
||||
function WeakAuras.regionPrototype.AddAdjustedDurationOptions(options, data, order)
|
||||
options.useAdjustededMin = {
|
||||
options.useAdjustedMin = {
|
||||
type = "toggle",
|
||||
width = WeakAuras.normalWidth,
|
||||
name = L["Set Minimum Progress"],
|
||||
@@ -83,7 +83,7 @@ function WeakAuras.regionPrototype.AddAdjustedDurationOptions(options, data, ord
|
||||
hidden = function() return not (not data.useAdjustededMin and data.useAdjustededMax) end,
|
||||
};
|
||||
|
||||
options.useAdjustededMax = {
|
||||
options.useAdjustedMax = {
|
||||
type = "toggle",
|
||||
width = WeakAuras.normalWidth,
|
||||
name = L["Set Maximum Progress"],
|
||||
@@ -505,9 +505,9 @@ function WeakAuras.regionPrototype.modify(parent, region, data)
|
||||
if (defaultsForRegion and defaultsForRegion.alpha) then
|
||||
region:SetRegionAlpha(data.alpha);
|
||||
end
|
||||
local hasAdjustedMin = defaultsForRegion and defaultsForRegion.useAdjustededMin ~= nil and data.useAdjustededMin
|
||||
local hasAdjustedMin = defaultsForRegion and defaultsForRegion.useAdjustedMin ~= nil and data.useAdjustededMin
|
||||
and data.adjustedMin;
|
||||
local hasAdjustedMax = defaultsForRegion and defaultsForRegion.useAdjustededMax ~= nil and data.useAdjustededMax
|
||||
local hasAdjustedMax = defaultsForRegion and defaultsForRegion.useAdjustedMax ~= nil and data.useAdjustededMax
|
||||
and data.adjustedMax;
|
||||
|
||||
region.adjustedMin = nil
|
||||
@@ -707,8 +707,8 @@ end
|
||||
-- Expand/Collapse function
|
||||
function WeakAuras.regionPrototype.AddExpandFunction(data, region, cloneId, parent, parentRegionType)
|
||||
local id = data.id
|
||||
local indynamicgroup = parentRegionType == "dynamicgroup";
|
||||
local ingroup = parentRegionType == "group";
|
||||
local inDynamicGroup = parentRegionType == "dynamicgroup";
|
||||
local inGroup = parentRegionType == "group";
|
||||
|
||||
local startMainAnimation = function()
|
||||
WeakAuras.Animate("display", data, "main", data.animation.main, region, false, nil, true, cloneId);
|
||||
@@ -730,7 +730,7 @@ function WeakAuras.regionPrototype.AddExpandFunction(data, region, cloneId, pare
|
||||
end
|
||||
|
||||
local hideRegion;
|
||||
if(indynamicgroup) then
|
||||
if(inDynamicGroup) then
|
||||
hideRegion = function()
|
||||
if region.PreHide then
|
||||
region:PreHide()
|
||||
@@ -761,7 +761,7 @@ function WeakAuras.regionPrototype.AddExpandFunction(data, region, cloneId, pare
|
||||
end
|
||||
end
|
||||
|
||||
if(indynamicgroup) then
|
||||
if(inDynamicGroup) then
|
||||
function region:Collapse()
|
||||
if (not region.toShow) then
|
||||
return;
|
||||
@@ -816,7 +816,7 @@ function WeakAuras.regionPrototype.AddExpandFunction(data, region, cloneId, pare
|
||||
hideRegion();
|
||||
end
|
||||
|
||||
if ingroup then
|
||||
if inGroup then
|
||||
parent:UpdateBorder(region);
|
||||
end
|
||||
|
||||
@@ -853,7 +853,7 @@ function WeakAuras.regionPrototype.AddExpandFunction(data, region, cloneId, pare
|
||||
startMainAnimation();
|
||||
end
|
||||
|
||||
if ingroup then
|
||||
if inGroup then
|
||||
parent:UpdateBorder(region);
|
||||
end
|
||||
|
||||
|
||||
Reference in New Issue
Block a user