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
+12 -12
View File
@@ -117,7 +117,7 @@ local properties = {
display = L["Orientation"],
setter = "SetOrientation",
type = "list",
values = WeakAuras.orientation_types
values = Private.orientation_types
},
inverse = {
display = L["Inverse"],
@@ -129,10 +129,9 @@ local properties = {
WeakAuras.regionPrototype.AddProperties(properties, default);
local function GetProperties(data)
local overlayInfo = WeakAuras.GetOverlayInfo(data);
local overlayInfo = Private.GetOverlayInfo(data);
if (overlayInfo and next(overlayInfo)) then
local auraProperties = {};
WeakAuras.DeepCopy(properties, auraProperties);
local auraProperties = CopyTable(properties)
for id, display in ipairs(overlayInfo) do
auraProperties["overlays." .. id] = {
@@ -758,11 +757,11 @@ local funcs = {
selfPoint = selfPoint or "CENTER"
if not WeakAuras.point_types[selfPoint] then
if not Private.point_types[selfPoint] then
selfPoint = "CENTER"
end
if not WeakAuras.point_types[anchorPoint] then
if not Private.point_types[anchorPoint] then
anchorPoint = "CENTER"
end
@@ -988,7 +987,7 @@ local function modify(parent, region, data)
-- Localize
local bar, iconFrame, icon = region.bar, region.iconFrame, region.icon;
region.useAuto = data.auto and WeakAuras.CanHaveAuto(data);
region.useAuto = data.auto and Private.CanHaveAuto(data);
-- Adjust region size
region:SetWidth(data.width);
@@ -1012,9 +1011,10 @@ local function modify(parent, region, data)
region.desaturateIcon = data.desaturate
region.zoom = data.zoom
region.overlays = {};
if (data.overlays) then
WeakAuras.DeepCopy(data.overlays, region.overlays);
region.overlays = CopyTable(data.overlays);
else
region.overlays = {}
end
-- Update texture settings
@@ -1084,16 +1084,16 @@ local function modify(parent, region, data)
region:UpdateEffectiveOrientation()
-- Update tooltip availability
local tooltipType = WeakAuras.CanHaveTooltip(data);
local tooltipType = Private.CanHaveTooltip(data);
if tooltipType and data.useTooltip then
-- Create and enable tooltip-hover frame
if not region.tooltipFrame then
region.tooltipFrame = CreateFrame("frame", nil, region);
region.tooltipFrame:SetAllPoints(icon);
region.tooltipFrame:SetScript("OnEnter", function()
WeakAuras.ShowMouseoverTooltip(region, region.tooltipFrame);
Private.ShowMouseoverTooltip(region, region.tooltipFrame);
end);
region.tooltipFrame:SetScript("OnLeave", WeakAuras.HideTooltip);
region.tooltipFrame:SetScript("OnLeave", Private.HideTooltip);
end
region.tooltipFrame:EnableMouse(true);