aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris B <1029chris@gmail.com>2016-02-16 19:34:48 -0800
committerChris B <1029chris@gmail.com>2016-02-16 19:34:48 -0800
commitac1ba9133f28de9c0f197a1e010b019462cff797 (patch)
tree18340453314b327a15b1b96885da6d06f9ac0a80
parenta59725ac5aad95aab1b000e9b2caf701eb30134d (diff)
Added .oldlayer variable to Windows
-rw-r--r--panel.lua6
-rw-r--r--var.lua3
-rw-r--r--window.lua2
3 files changed, 11 insertions, 0 deletions
diff --git a/panel.lua b/panel.lua
index d8394c4..98a15b3 100644
--- a/panel.lua
+++ b/panel.lua
@@ -23,9 +23,11 @@ function drawStart()
and sys.mouse.p.x <= (panel.s.x+72)+(panel.s.width*2)
and sys.mouse.p.y >= panel.s.y and sys.mouse.p.y <= panel.s.y+panel.s.height) then
if win[panel.b[1]].min == false then
+ win[panel.b[1]].oldlayer = win[panel.b[1]].layer
win[panel.b[1]].layer = 1
elseif win[panel.b[1]].min == true then
win[panel.b[1]].min = false
+ win[panel.b[1]].oldlayer = win[panel.b[1]].layer
win[panel.b[1]].layer = 1
end
end
@@ -45,9 +47,11 @@ function drawStart()
and sys.mouse.p.x <= (panel.s.x+72+70+67)+(panel.s.width*2)
and sys.mouse.p.y >= panel.s.y and sys.mouse.p.y <= panel.s.y+panel.s.height) then
if win[panel.b[2]].min == false then
+ win[panel.b[2]].oldlayer = win[panel.b[2]].layer
win[panel.b[2]].layer = 1
elseif win[panel.b[2]].min == true then
win[panel.b[2]].min = false
+ win[panel.b[2]].oldlayer = win[panel.b[2]].layer
win[panel.b[2]].layer = 1
end
end
@@ -67,9 +71,11 @@ function drawStart()
and sys.mouse.p.x <= (panel.s.x+72+137+137)+(panel.s.width*2)
and sys.mouse.p.y >= panel.s.y and sys.mouse.p.y <= panel.s.y+panel.s.height) then
if win[panel.b[3]].min == false then
+ win[panel.b[3]].oldlayer = win[panel.b[3]].layer
win[panel.b[3]].layer = 1
elseif win[panel.b[2]].min == true then
win[panel.b[3]].min = false
+ win[panel.b[3]].oldlayer = win[panel.b[3]].layer
win[panel.b[3]].layer = 1
end
end
diff --git a/var.lua b/var.lua
index 59e7207..4f544d8 100644
--- a/var.lua
+++ b/var.lua
@@ -58,6 +58,7 @@ function loadVar()
win[1].title = "Chat"
win[1].layer = 0
win[1].panel = 0
+ win[1].oldlayer = 0
win[2] = {}
win[2].x = 100
win[2].y = 100
@@ -74,6 +75,7 @@ function loadVar()
win[2].title = "Internet"
win[2].layer = 0
win[2].panel = 0
+ win[2].oldlayer = 0
win[3] = {}
win[3].x = 100
win[3].y = 100
@@ -90,6 +92,7 @@ function loadVar()
win[3].title = "Files"
win[3].layer = 0
win[3].panel = 0
+ win[3].oldlayer = 0
winOpen = true
start = {}
start.cvs = love.graphics.newCanvas(250, 350)
diff --git a/window.lua b/window.lua
index 100e8f8..e3b9f1f 100644
--- a/window.lua
+++ b/window.lua
@@ -24,6 +24,7 @@ function drawWindow(id)
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) then
sys.mouse.drag = true
+ win[id].oldlayer = win[id].layer
win[id].layer = 1
end
if sys.mouse.p.p == false then
@@ -96,6 +97,7 @@ function orderWindow(id)
elseif win[id].ex == false or win[id].s ~= 0 then
if layer[1] == 0 then
layer[1] = id
+ win[id].oldlayer = win[id].layer
win[id].layer = 1
end
if layer[1] ~= id and win[id].layer == 1 then