library-mirrors/LoveFrames
1
0
Fork 0
mirror of https://github.com/linux-man/LoveFrames.git synced 2024-11-18 16:04:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #119 from qaisjp/patch-2

Browse Source 
Fixed Frame:MakeTop() chaining issue
This commit is contained in:
Kenny Shields 2014-04-20 18:06:01 -04:00
commit 3c09e85d2b
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
objects/frame.lua
View File

@ -762,30 +762,27 @@ end
--]]--------------------------------------------------------- --]]---------------------------------------------------------
function newobject:MakeTop() function newobject:MakeTop()
local x, y = love.mouse.getPosition()
local key = 0 local key = 0
local base = loveframes.base
local basechildren = base.children local basechildren = base.children
local numbasechildren = #basechildren local numbasechildren = #basechildren
local parent = self.parent
-- check to see if the object's parent is not the base object -- check to see if the object's parent is not the base object
if parent ~= base then if self.parent ~= loveframes.base then
local baseparent = self:GetBaseParent() local baseparent = self:GetBaseParent()
if baseparent.type == "frame" then if baseparent.type == "frame" then
baseparent:MakeTop() baseparent:MakeTop()
end end
return return self
end end
-- check to see if the object is the only child of the base object -- check to see if the object is the only child of the base object
if numbasechildren == 1 then if numbasechildren == 1 then
return return self
end end
-- check to see if the object is already at the top -- check to see if the object is already at the top
if basechildren[numbasechildren] == self then if basechildren[numbasechildren] == self then
return return self
end end
-- make this the top object -- make this the top object
@ -1106,4 +1103,4 @@ function newobject:GetAlwaysOnTop()
return self.alwaysontop return self.alwaysontop
end end