aboutsummaryrefslogtreecommitdiff
path: root/window.lua
diff options
context:
space:
mode:
authorChris B <1029chris@gmail.com>2016-01-27 12:26:45 -0800
committerChris B <1029chris@gmail.com>2016-01-27 12:26:45 -0800
commit9e09ef17829abb61a18392fee06db6037664b3ee (patch)
tree44fea123d70a4c44523d7c0c88c18fdb81a6d1ce /window.lua
parent05e01a2d69895593ed4d6b069ea2d4a7e4615cba (diff)
Redid layer system. This time simpler. It works!
Diffstat (limited to 'window.lua')
-rw-r--r--window.lua11
1 files changed, 3 insertions, 8 deletions
diff --git a/window.lua b/window.lua
index 0d77040..49f780b 100644
--- a/window.lua
+++ b/window.lua
@@ -22,16 +22,16 @@ function drawWindow(id)
love.graphics.print(win[id].title, 0+6, 0+9) --Title
love.graphics.setCanvas()
if(sys.mouse.p.p == true and sys.mouse.p.x >= win[id].x+2 and sys.mouse.p.x <= (win[id].x+2)+(win[id].w-44)
- and sys.mouse.p.y >= win[id].y+2 and sys.mouse.p.y <= win[id].y+22) and win[id].layer == 1 then
+ and sys.mouse.p.y >= win[id].y+2 and sys.mouse.p.y <= win[id].y+22) then
sys.mouse.drag = true
- test = true
+ win[id].layer = 1
end
if sys.mouse.p.p == false then
sys.mouse.drag = false
win[id].px = win[id].x
win[id].py = win[id].y
end
- if sys.mouse.drag == true and win[id].min == false and win[id].ex == false and id == layer[1].id then
+ if sys.mouse.drag == true and win[id].min == false and win[id].ex == false and layer[1] == id then
win[id].x = win[id].px + (sys.mouse.x - sys.mouse.p.x)
win[id].y = win[id].py + (sys.mouse.y - sys.mouse.p.y)
end
@@ -69,9 +69,4 @@ function drawWindow(id)
win[id].miny = 0
end
love.graphics.setColor(255,255,255)
- layer[win[id].layer].id = id
- layer[win[id].layer].cvs = win[id].cvs
- layer[win[id].layer].x = win[id].x
- layer[win[id].layer].y = win[id].y
- layer[win[id].layer].s = win[id].s
end