This commit is contained in:
Bunny67
2018-06-07 21:44:10 +03:00
parent d34a72dd33
commit 06fa470c01
4 changed files with 10 additions and 8 deletions
+2 -1
View File
@@ -6,6 +6,7 @@ local Sticky = LibStub("LibSimpleSticky-1.0");
local _G = _G local _G = _G
local type, unpack, pairs = type, unpack, pairs local type, unpack, pairs = type, unpack, pairs
local format, split, find = string.format, string.split, string.find local format, split, find = string.format, string.split, string.find
local tinsert = table.insert
--WoW API / Variables --WoW API / Variables
local CreateFrame = CreateFrame local CreateFrame = CreateFrame
@@ -72,7 +73,7 @@ local function CreateMover(parent, name, text, overlay, snapOffset, postdrag, sh
end end
E.CreatedMovers[name].mover = f E.CreatedMovers[name].mover = f
E["snapBars"][getn(E["snapBars"]) + 1] = f tinsert(E["snapBars"], f)
local fs = f:CreateFontString(nil, "OVERLAY") local fs = f:CreateFontString(nil, "OVERLAY")
E:FontTemplate(fs) E:FontTemplate(fs)
+3 -3
View File
@@ -426,9 +426,9 @@ end
E.UIParent = CreateFrame("Frame", "ElvUIParent", UIParent) E.UIParent = CreateFrame("Frame", "ElvUIParent", UIParent)
E.UIParent:SetFrameLevel(UIParent:GetFrameLevel()) E.UIParent:SetFrameLevel(UIParent:GetFrameLevel())
E.UIParent:SetPoint("CENTER", UIParent, "CENTER") E.UIParent:SetPoint("CENTER", UIParent, "CENTER")
E.UIParent:SetHeight(UIParent:GetHeight()) E.UIParent:SetHeight(GetScreenHeight())
E.UIParent:SetWidth(UIParent:GetWidth()) E.UIParent:SetWidth(GetScreenWidth())
E["snapBars"][table.getn(E["snapBars"]) + 1] = E.UIParent tinsert(E["snapBars"], E.UIParent)
E.HiddenFrame = CreateFrame("Frame") E.HiddenFrame = CreateFrame("Frame")
E.HiddenFrame:Hide() E.HiddenFrame:Hide()
@@ -24,6 +24,8 @@ local StickyFrames, oldminor = LibStub:NewLibrary(MAJOR, MINOR)
if not StickyFrames then return end if not StickyFrames then return end
local ipairs = ipairs
--[[--------------------------------------------------------------------------------- --[[---------------------------------------------------------------------------------
Class declaration, along with a temporary table to hold any existing OnUpdate Class declaration, along with a temporary table to hold any existing OnUpdate
scripts. scripts.
@@ -134,8 +136,7 @@ function StickyFrames:GetUpdateFunc(frame, frameList, xoffset, yoffset, left, to
frame:SetPoint("CENTER", UIParent, "BOTTOMLEFT", x+xoffset, y+yoffset) frame:SetPoint("CENTER", UIParent, "BOTTOMLEFT", x+xoffset, y+yoffset)
StickyFrames.sticky[frame] = nil StickyFrames.sticky[frame] = nil
for i = 1, table.getn(frameList) do for i, v in ipairs(frameList) do
local v = frameList[i]
if frame ~= v and frame ~= v:GetParent() and not IsShiftKeyDown() and v:IsVisible() then if frame ~= v and frame ~= v:GetParent() and not IsShiftKeyDown() and v:IsVisible() then
if self:SnapFrame(frame, v, left, top, right, bottom) then if self:SnapFrame(frame, v, left, top, right, bottom) then
StickyFrames.sticky[frame] = v StickyFrames.sticky[frame] = v
+2 -2
View File
@@ -154,8 +154,8 @@ local function updateIcon(element, unit, index, offset, filter, isDebuff, visibl
end end
if element.forceShow then if element.forceShow then
texture = "Interface\\Icons\\Spell_Holy_DivineSpirit" texture = 'Interface\\Icons\\Spell_Holy_DivineSpirit'
count, dispelType, duration, expiration = 5, 'Magic', 0, 60 count, dispelType = 5, 'Magic'
end end
if texture then if texture then