aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--system.lua11
-rw-r--r--var.lua66
-rw-r--r--window.lua69
3 files changed, 118 insertions, 28 deletions
diff --git a/system.lua b/system.lua
index 1fb0dd6..888af73 100644
--- a/system.lua
+++ b/system.lua
@@ -1,8 +1,12 @@
function drawSystem()
+ love.graphics.setBackgroundColor(0, 128, 128)
drawDesktop()
orderWindow(1)
orderWindow(2)
orderWindow(3)
+ orderWindow(4)
+ orderWindow(5)
+ orderWindow(6)
if(sys.mouse.p.p == true and start.p == false and sys.mouse.p.x >= panel.s.x
and sys.mouse.p.x <= panel.s.x+panel.s.width
and sys.mouse.p.y >= panel.s.y and sys.mouse.p.y <= panel.s.y+panel.s.height) then
@@ -41,11 +45,8 @@ function drawSystem()
if start.o == true then
drawMenu()
end
- --love.graphics.print(layer[1] .. layer[2] .. layer[3] .. layer[4] .. layer[5] .. layer[6] .. layer[7])
- --love.graphics.print(win[1].layer .. win[2].layer .. win[3].layer, 0, 20)
- --if win[1].hover == true then
- -- love.graphics.print("YAAAAS", 0, 40)
- --end
+ love.graphics.print(layer[1] .. layer[2] .. layer[3] .. layer[4] .. layer[5] .. layer[6] .. layer[7])
+ love.graphics.print(win[1].layer .. win[2].layer .. win[3].layer .. win[4].layer .. win[5].layer .. win[6].layer, 0, 20)
if fade == 0 and fadeOpacity ~= 0 then
love.graphics.setColor(0, 0, 0, fadeOpacity)
love.graphics.rectangle("fill", 0, 0, sys.w, sys.h)
diff --git a/var.lua b/var.lua
index b5c30a4..e71ff6c 100644
--- a/var.lua
+++ b/var.lua
@@ -63,6 +63,7 @@ function loadVar()
win[1].oldlayer = 0
win[1].hov = false
win[1].hover = false
+ win[1].update = true
win[2] = {}
win[2].x = 75
win[2].y = 9
@@ -82,6 +83,7 @@ function loadVar()
win[2].oldlayer = 0
win[2].hov = false
win[2].hover = false
+ win[2].update = true
win[3] = {}
win[3].x = 100
win[3].y = 100
@@ -101,6 +103,67 @@ function loadVar()
win[3].oldlayer = 0
win[3].hov = false
win[3].hover = false
+ win[3].update = true
+ win[4] = {}
+ win[4].x = 100
+ win[4].y = 100
+ win[4].w = 200
+ win[4].h = 150
+ win[4].px = win[4].x
+ win[4].py = win[4].y
+ win[4].ex = true
+ win[4].cvs = love.graphics.newCanvas(win[4].w, win[4].h)
+ win[4].fd = false
+ win[4].s = 0
+ win[4].min = false
+ win[4].miny = 0
+ win[4].title = "Anti Virus"
+ win[4].layer = 0
+ win[4].panel = 0
+ win[4].oldlayer = 0
+ win[4].hov = false
+ win[4].hover = false
+ win[4].update = true
+ win[5] = {}
+ win[5].x = 100
+ win[5].y = 100
+ win[5].w = 450
+ win[5].h = 400
+ win[5].px = win[5].x
+ win[5].py = win[5].y
+ win[5].ex = true
+ win[5].cvs = love.graphics.newCanvas(win[5].w, win[5].h)
+ win[5].fd = false
+ win[5].s = 0
+ win[5].min = false
+ win[5].miny = 0
+ win[5].title = "Help"
+ win[5].layer = 0
+ win[5].panel = 0
+ win[5].oldlayer = 0
+ win[5].hov = false
+ win[5].hover = false
+ win[5].update = true
+ win[6] = {}
+ win[6].x = 100
+ win[6].y = 100
+ win[6].w = 400
+ win[6].h = 550
+ win[6].px = win[6].x
+ win[6].py = win[6].y
+ win[6].ex = true
+ win[6].cvs = love.graphics.newCanvas(win[6].w, win[6].h)
+ win[6].fd = false
+ win[6].s = 0
+ win[6].min = false
+ win[6].miny = 0
+ win[6].title = "Settings"
+ win[6].layer = 0
+ win[6].panel = 0
+ win[6].oldlayer = 0
+ win[6].hov = false
+ win[6].hover = false
+ win[6].update = true
winOpen = true
minim = love.graphics.getHeight()+10
start = {}
@@ -127,6 +190,7 @@ function loadVar()
}
desktop.bg.current = 0
fade = 0
- fadeOpacity = 255
+ fadeOpacity = 0
scene = 1
+ loading = 0
end
diff --git a/window.lua b/window.lua
index 19820e1..b736db2 100644
--- a/window.lua
+++ b/window.lua
@@ -1,26 +1,29 @@
function drawWindow(id)
- love.graphics.setCanvas(win[id].cvs)
- love.graphics.setColor(192, 192, 192)
- love.graphics.rectangle("fill", 0, 0, win[id].w, win[id].h) --Box
- love.graphics.setLineWidth(4)
- love.graphics.setColor(220, 220, 220)
- love.graphics.line(0, win[id].y+win[id].h, 0, 0, 0+win[id].w, 0) --BoxLight
- love.graphics.setColor(150,150,150)
- love.graphics.line(0, 0+win[id].h, 0+win[id].w, 0+win[id].h, 0+win[id].w, 0) --BoxShadow
- love.graphics.setColor(0,0,120)
- love.graphics.rectangle("fill", 0+3, 0+3, win[id].w-7, 20) --Blue Bar
- love.graphics.setColor(192, 192, 192)
- love.graphics.rectangle("fill", 0+win[id].w-22, 0+5, 16, 16) --X Button
- love.graphics.setColor(70,70,70)
- love.graphics.print("X", 0+win[id].w-19, 0+10)
- love.graphics.setColor(192, 192, 192)
- love.graphics.rectangle("fill", 0+win[id].w-40, 0+5, 16, 16) --Minimize Button
- love.graphics.setColor(70,70,70)
- love.graphics.setLineWidth(3)
- love.graphics.line(0+win[id].w-37, 0+13, 0+win[id].w-37+10, 0+13)
- love.graphics.setColor(220, 220, 220)
- love.graphics.print(win[id].title, 0+6, 0+9) --Title
- love.graphics.setCanvas()
+ if win[id].update == true then
+ love.graphics.setCanvas(win[id].cvs)
+ love.graphics.setColor(192, 192, 192)
+ love.graphics.rectangle("fill", 0, 0, win[id].w, win[id].h) --Box
+ love.graphics.setLineWidth(4)
+ love.graphics.setColor(220, 220, 220)
+ love.graphics.line(0, win[id].y+win[id].h, 0, 0, 0+win[id].w, 0) --BoxLight
+ love.graphics.setColor(150,150,150)
+ love.graphics.line(0, 0+win[id].h, 0+win[id].w, 0+win[id].h, 0+win[id].w, 0) --BoxShadow
+ love.graphics.setColor(0,0,120)
+ love.graphics.rectangle("fill", 0+3, 0+3, win[id].w-7, 20) --Blue Bar
+ love.graphics.setColor(192, 192, 192)
+ love.graphics.rectangle("fill", 0+win[id].w-22, 0+5, 16, 16) --X Button
+ love.graphics.setColor(70,70,70)
+ love.graphics.print("X", 0+win[id].w-19, 0+10)
+ love.graphics.setColor(192, 192, 192)
+ love.graphics.rectangle("fill", 0+win[id].w-40, 0+5, 16, 16) --Minimize Button
+ love.graphics.setColor(70,70,70)
+ love.graphics.setLineWidth(3)
+ love.graphics.line(0+win[id].w-37, 0+13, 0+win[id].w-37+10, 0+13)
+ love.graphics.setColor(220, 220, 220)
+ love.graphics.print(win[id].title, 0+6, 0+9) --Title
+ love.graphics.setCanvas()
+ win[id].update = false
+ end
if(sys.mouse.x >= win[id].x and sys.mouse.x <= win[id].x+win[id].w
and sys.mouse.y >= win[id].y and sys.mouse.y <= win[id].y+win[id].h) then
win[id].hov = true
@@ -153,6 +156,15 @@ function orderWindow(id)
panel.b[4] = panel.b[5]
panel.b[5] = panel.b[6]
panel.b[6] = panel.b[7]
+ elseif panel.b[4] == id then
+ panel.b[4] = panel.b[5]
+ panel.b[5] = panel.b[6]
+ panel.b[6] = panel.b[7]
+ elseif panel.b[5] == id then
+ panel.b[5] = panel.b[6]
+ panel.b[6] = panel.b[7]
+ elseif panel.b[6] == id then
+ panel.b[6] = panel.b[7]
end
elseif win[id].ex == false or win[id].s ~= 0 then
if layer[1] == 0 and layer[2] == id then
@@ -243,6 +255,10 @@ function orderWindow(id)
win[layer[2]].oldlayer = win[layer[2]].layer
win[layer[2]].layer = 2
end
+ if layer[1] ~= 0 then
+ win[layer[1]].oldlayer = win[layer[1]].layer
+ win[layer[1]].layer = 1
+ end
end
if layer[2] == id and win[id].layer ~= 2 then
layer[2] = 0
@@ -268,6 +284,15 @@ function orderWindow(id)
panel.b[2] = id
elseif panel.b[3] == 0 and panel.b[1] ~= id and panel.b[2] ~= id then
panel.b[3] = id
+ elseif (panel.b[4] == 0 and panel.b[1] ~= id and panel.b[2] ~= id
+ and panel.b[3] ~= id) then
+ panel.b[4] = id
+ elseif (panel.b[5] == 0 and panel.b[1] ~= id and panel.b[2] ~= id
+ and panel.b[3] ~= id and panel.b[4] ~= id) then
+ panel.b[5] = id
+ elseif (panel.b[6] == 0 and panel.b[1] ~= id and panel.b[2] ~= id
+ and panel.b[3] ~= id and panel.b[4] ~= id and panel.b[5] ~= id) then
+ panel.b[6] = id
end
drawWindow(id)
end