diff --git a/ElvUI/Core/Movers.lua b/ElvUI/Core/Movers.lua index 59181ca..f9cf335 100644 --- a/ElvUI/Core/Movers.lua +++ b/ElvUI/Core/Movers.lua @@ -6,6 +6,7 @@ local Sticky = LibStub("LibSimpleSticky-1.0"); local _G = _G local type, unpack, pairs = type, unpack, pairs local format, split, find = string.format, string.split, string.find +local tinsert = table.insert --WoW API / Variables local CreateFrame = CreateFrame @@ -72,7 +73,7 @@ local function CreateMover(parent, name, text, overlay, snapOffset, postdrag, sh end E.CreatedMovers[name].mover = f - E["snapBars"][getn(E["snapBars"]) + 1] = f + tinsert(E["snapBars"], f) local fs = f:CreateFontString(nil, "OVERLAY") E:FontTemplate(fs) diff --git a/ElvUI/Core/core.lua b/ElvUI/Core/core.lua index 6fab1ca..c1f41a1 100644 --- a/ElvUI/Core/core.lua +++ b/ElvUI/Core/core.lua @@ -426,9 +426,9 @@ end E.UIParent = CreateFrame("Frame", "ElvUIParent", UIParent) E.UIParent:SetFrameLevel(UIParent:GetFrameLevel()) E.UIParent:SetPoint("CENTER", UIParent, "CENTER") -E.UIParent:SetHeight(UIParent:GetHeight()) -E.UIParent:SetWidth(UIParent:GetWidth()) -E["snapBars"][table.getn(E["snapBars"]) + 1] = E.UIParent +E.UIParent:SetHeight(GetScreenHeight()) +E.UIParent:SetWidth(GetScreenWidth()) +tinsert(E["snapBars"], E.UIParent) E.HiddenFrame = CreateFrame("Frame") E.HiddenFrame:Hide() diff --git a/ElvUI/Libraries/LibSimpleSticky/LibSimpleSticky.lua b/ElvUI/Libraries/LibSimpleSticky/LibSimpleSticky.lua index f05295d..f7dfe6c 100644 --- a/ElvUI/Libraries/LibSimpleSticky/LibSimpleSticky.lua +++ b/ElvUI/Libraries/LibSimpleSticky/LibSimpleSticky.lua @@ -24,6 +24,8 @@ local StickyFrames, oldminor = LibStub:NewLibrary(MAJOR, MINOR) if not StickyFrames then return end +local ipairs = ipairs + --[[--------------------------------------------------------------------------------- Class declaration, along with a temporary table to hold any existing OnUpdate scripts. @@ -134,8 +136,7 @@ function StickyFrames:GetUpdateFunc(frame, frameList, xoffset, yoffset, left, to frame:SetPoint("CENTER", UIParent, "BOTTOMLEFT", x+xoffset, y+yoffset) StickyFrames.sticky[frame] = nil - for i = 1, table.getn(frameList) do - local v = frameList[i] + for i, v in ipairs(frameList) do if frame ~= v and frame ~= v:GetParent() and not IsShiftKeyDown() and v:IsVisible() then if self:SnapFrame(frame, v, left, top, right, bottom) then StickyFrames.sticky[frame] = v diff --git a/ElvUI/Libraries/oUF/elements/auras.lua b/ElvUI/Libraries/oUF/elements/auras.lua index 9084dca..1c2c991 100644 --- a/ElvUI/Libraries/oUF/elements/auras.lua +++ b/ElvUI/Libraries/oUF/elements/auras.lua @@ -154,8 +154,8 @@ local function updateIcon(element, unit, index, offset, filter, isDebuff, visibl end if element.forceShow then - texture = "Interface\\Icons\\Spell_Holy_DivineSpirit" - count, dispelType, duration, expiration = 5, 'Magic', 0, 60 + texture = 'Interface\\Icons\\Spell_Holy_DivineSpirit' + count, dispelType = 5, 'Magic' end if texture then