Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add support for layouts with oUF embedded #7

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add support for layouts with oUF embedded #7

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
99092d1
Add support for embedded instances of oUF
p3lim Dec 22, 2014
741c18b
Don't attempt to find other instances if we're embedded.
p3lim Dec 22, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 44 additions & 20 deletions movable.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
local _NAME, _NS = ...
local oUF = _NS.oUF or oUF

assert(oUF, "oUF_MovableFrames was unable to locate oUF install.")
local instances = {}
if(_NS.oUF) then
table.insert(instances, _NS.oUF)
end

-- The DB is organized as the following:
-- {
Expand Down Expand Up @@ -116,13 +118,15 @@ local restoreDefaultPosition = function(style, identifier)
if(not _DB.__INITIAL or not _DB.__INITIAL[style] or not _DB.__INITIAL[style][identifier]) then return end

local obj, isHeader
for _, frame in next, oUF.objects do
local fStyle, fIdentifier, fIsHeader = getObjectInformation(frame)
if(fStyle == style and fIdentifier == identifier) then
obj = frame
isHeader = fIsHeader

break
for _, oUF in next, instances do
for _, frame in next, oUF.objects do
local fStyle, fIdentifier, fIsHeader = getObjectInformation(frame)
if(fStyle == style and fIdentifier == identifier) then
obj = frame
isHeader = fIsHeader

break
end
end
end

Expand Down Expand Up @@ -181,10 +185,12 @@ local function restorePosition(obj)
end

local restoreCustomPosition = function(style, ident)
for _, obj in next, oUF.objects do
local objStyle, objIdent = getObjectInformation(obj)
if(objStyle == style and objIdent == ident) then
return restorePosition(obj)
for _, oUF in next, instances do
for _, obj in next, oUF.objects do
local objStyle, objIdent = getObjectInformation(obj)
if(objStyle == style and objIdent == ident) then
return restorePosition(obj)
end
end
end
end
Expand Down Expand Up @@ -347,12 +353,29 @@ do
end)

function frame:VARIABLES_LOADED()
-- Catch all oUF instances
if(#instances == 0) then
for index = 1, GetNumAddOns() do
local addon = GetAddOnInfo(index)
local global = GetAddOnMetadata(addon, 'X-oUF')
if(global) then
table.insert(instances, _G[global])
end
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Might be better to just check if _NAME differs from "oUF: MovableFrames", not everyone might care about using a global name.

end

assert(#instances > 0, "oUF_MovableFrames was unable to locate oUF install.")
end

-- I honestly don't trust the load order of SVs.
_DB = _G[_DBNAME] or {}
_G[_DBNAME] = _DB
-- Got to catch them all!
for _, obj in next, oUF.objects do
restorePosition(obj)
for _, oUF in next, instances do
for _, obj in next, oUF.objects do
restorePosition(obj)
end

oUF:RegisterInitCallback(restorePosition)
end

-- Clean up the defaults DB:
Expand All @@ -370,7 +393,6 @@ do
end
end

oUF:RegisterInitCallback(restorePosition)
self:UnregisterEvent"VARIABLES_LOADED"
end
frame:RegisterEvent"VARIABLES_LOADED"
Expand Down Expand Up @@ -1006,10 +1028,12 @@ SlashCmdList[slashGlobal] = function(inp)
InterfaceOptionsFrame_OpenToCategory(_TITLE)
else
if(not _LOCK) then
for k, obj in next, oUF.objects do
local style, identifier, isHeader = getObjectInformation(obj)
local backdrop = getBackdrop(obj, isHeader)
if(backdrop) then backdrop:Show() end
for _, oUF in next, instances do
for k, obj in next, oUF.objects do
local style, identifier, isHeader = getObjectInformation(obj)
local backdrop = getBackdrop(obj, isHeader)
if(backdrop) then backdrop:Show() end
end
end

_LOCK = true
Expand Down