from retail
This commit is contained in:
@@ -2827,7 +2827,7 @@ end
|
||||
scheduleRefillFrame.ids = {}
|
||||
|
||||
|
||||
-- TODO replace older ReloadOptions, SchduleReloadOptions, ReloadTriggerOptions, ReloadGroupRegionOptions
|
||||
-- TODO replace older ReloadOptions, ScheduleReloadOptions, ReloadTriggerOptions, ReloadGroupRegionOptions
|
||||
-- automatically clear parent/tempGroup ?
|
||||
function WeakAuras.ReloadOptions2(id, data)
|
||||
displayOptions[id] = nil
|
||||
@@ -2838,7 +2838,7 @@ function WeakAuras.RefillOptions()
|
||||
frame:RefillOptions()
|
||||
end
|
||||
|
||||
function WeakAuras.SchduleRefillOptions()
|
||||
function WeakAuras.ScheduleRefillOptions()
|
||||
scheduleRefillFrame:ScheduleRefillOnly()
|
||||
end
|
||||
|
||||
@@ -3329,7 +3329,7 @@ function WeakAuras.ReloadTriggerOptions(data)
|
||||
local function hideTriggerCombiner()
|
||||
return not (data.triggers.disjunctive == "custom")
|
||||
end
|
||||
WeakAuras.AddCodeOption(trigger_options, data, L["Custom"], "custom_trigger_combination", "https://github.com/WeakAuras/WeakAuras2/wiki/Aura-Activation-and-Deactivation",
|
||||
WeakAuras.AddCodeOption(trigger_options, data, L["Custom"], "custom_trigger_combination", "https://github.com/WeakAuras/WeakAuras2/wiki/Custom-Code-Blocks#custom-activation",
|
||||
0.1, hideTriggerCombiner, {"triggers", "customTriggerLogic"}, false);
|
||||
|
||||
local order = 81;
|
||||
@@ -3848,7 +3848,7 @@ function WeakAuras.PositionOptions(id, data, _, hideWidthHeight, disableSelfPoin
|
||||
type = "toggle",
|
||||
width = WeakAuras.normalWidth,
|
||||
name = L["Set Parent to Anchor"],
|
||||
desc = L["Sets the anchored frame as the aura's parent, causing the aura to inherit attributes such as visiblility and scale."],
|
||||
desc = L["Sets the anchored frame as the aura's parent, causing the aura to inherit attributes such as visibility and scale."],
|
||||
order = 77,
|
||||
get = function()
|
||||
return data.anchorFrameParent or data.anchorFrameParent == nil;
|
||||
@@ -3875,7 +3875,7 @@ function WeakAuras.PositionOptions(id, data, _, hideWidthHeight, disableSelfPoin
|
||||
end
|
||||
},
|
||||
};
|
||||
WeakAuras.AddCodeOption(positionOptions, data, L["Custom Anchor"], "custom_anchor", "https://github.com/WeakAuras/WeakAuras2/wiki/Custom-Anchor",
|
||||
WeakAuras.AddCodeOption(positionOptions, data, L["Custom Anchor"], "custom_anchor", "https://github.com/WeakAuras/WeakAuras2/wiki/Custom-Code-Blocks#custom-anchor-function",
|
||||
72.1, function() return not(data.anchorFrameType == "CUSTOM" and not IsParentDynamicGroup()) end, {"customAnchor"}, nil, nil, nil, nil, nil, true)
|
||||
return positionOptions;
|
||||
end
|
||||
@@ -4134,8 +4134,8 @@ function WeakAuras.SortDisplayButtons(filter, overrideReset, id)
|
||||
|
||||
for _, child in ipairs(to_sort) do
|
||||
child.frame:Show();
|
||||
if child.AcquireThumnail then
|
||||
child:AcquireThumnail()
|
||||
if child.AcquireThumbnail then
|
||||
child:AcquireThumbnail()
|
||||
end
|
||||
tinsert(frame.buttonsScroll.children, child);
|
||||
local controlledChildren = children[child:GetTitle()];
|
||||
@@ -4144,8 +4144,8 @@ function WeakAuras.SortDisplayButtons(filter, overrideReset, id)
|
||||
for _, groupchild in ipairs(controlledChildren) do
|
||||
if(child:GetExpanded() and visible[groupchild]) then
|
||||
displayButtons[groupchild].frame:Show();
|
||||
if displayButtons[groupchild].AcquireThumnail then
|
||||
displayButtons[groupchild]:AcquireThumnail()
|
||||
if displayButtons[groupchild].AcquireThumbnail then
|
||||
displayButtons[groupchild]:AcquireThumbnail()
|
||||
end
|
||||
tinsert(frame.buttonsScroll.children, displayButtons[groupchild]);
|
||||
end
|
||||
@@ -4199,8 +4199,8 @@ function WeakAuras.SortDisplayButtons(filter, overrideReset, id)
|
||||
|
||||
for _, child in ipairs(to_sort) do
|
||||
child.frame:Show();
|
||||
if child.AcquireThumnail then
|
||||
child:AcquireThumnail()
|
||||
if child.AcquireThumbnail then
|
||||
child:AcquireThumbnail()
|
||||
end
|
||||
tinsert(frame.buttonsScroll.children, child);
|
||||
local controlledChildren = children[child:GetTitle()];
|
||||
@@ -4209,8 +4209,8 @@ function WeakAuras.SortDisplayButtons(filter, overrideReset, id)
|
||||
for _, groupchild in ipairs(controlledChildren) do
|
||||
if(child:GetExpanded() and visible[groupchild]) then
|
||||
displayButtons[groupchild].frame:Show();
|
||||
if displayButtons[groupchild].AcquireThumnail then
|
||||
displayButtons[groupchild]:AcquireThumnail()
|
||||
if displayButtons[groupchild].AcquireThumbnail then
|
||||
displayButtons[groupchild]:AcquireThumbnail()
|
||||
end
|
||||
tinsert(frame.buttonsScroll.children, displayButtons[groupchild]);
|
||||
end
|
||||
@@ -4224,8 +4224,8 @@ function WeakAuras.SortDisplayButtons(filter, overrideReset, id)
|
||||
local groupVisible = not group or visible[group] and displayButtons[group]:GetExpanded()
|
||||
if(not groupVisible or not visible[id]) then
|
||||
child.frame:Hide();
|
||||
if child.ReleaseThumnail then
|
||||
child:ReleaseThumnail()
|
||||
if child.ReleaseThumbnail then
|
||||
child:ReleaseThumbnail()
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user