Redesigned many things, added color variables, added elements.lua

It looks closer to Windows 98 now.

8 files changed, 96 insertions, 16 deletions

diff --git a/antivirus.lua b/antivirus.lua
index a518494..ebde1a2 100644
--- a/antivirus.lua
+++ b/antivirus.lua
@@ -1,13 +1,19 @@
 function drawAntivirus()
   love.graphics.setColor(150,150,150)
   love.graphics.setLineWidth(2)
-  love.graphics.rectangle("line", 49, 110, 100, 19)
-  love.graphics.rectangle("line", 10, 40, 180, 30)
+  if antivirus.scanning == true then
+    drawDownBox(49, 110, 100, 19, 2)
+  else
+    drawUpBox(49, 110, 100, 19, 2)
+  end
+  drawDownBox(10, 40, 180, 30, 2)
   love.graphics.setColor(70,70,70)
   love.graphics.print("SCAN NOW", 51, 116)
   love.graphics.print(antivirus.status, 10, 77)
   love.graphics.setColor(0,0,120)
-  love.graphics.rectangle("fill", 13, 43, antivirus.prog, 24)
+  if antivirus.scanning == true then
+    drawBlueBox(13, 44, antivirus.prog, 22, 2)
+  end
 end
 function updateAntivirus()
   if (sys.mouse.p.p == true and win[4].hover == true and antivirus.scanning == false
diff --git a/assets.lua b/assets.lua
index b5b6367..ee04d89 100644
--- a/assets.lua
+++ b/assets.lua
@@ -29,4 +29,7 @@ function loadAssets()
   music.battle1:setLooping(true)
   music.battle2:setLooping(true)
   music.battle3:setLooping(true)
+  window = {
+    barAsset = love.graphics.newImage("assets/win_bar.png")
+  }
 end
diff --git a/assets/win_bar.png b/assets/win_bar.png
new file mode 100644
index 0000000..4a9b633
--- /dev/null
+++ b/assets/win_bar.png
diff --git a/elements.lua b/elements.lua
new file mode 100644
index 0000000..17cf20a
--- /dev/null
+++ b/elements.lua
@@ -0,0 +1,61 @@
+function loadElements()
+  window.x = love.graphics.newCanvas(16, 16)
+  window.min = love.graphics.newCanvas(16, 16)
+  window.bar = love.graphics.newCanvas(643, 20)
+  love.graphics.setCanvas(window.x)
+  love.graphics.setColor(colors.win.normal)
+  love.graphics.rectangle("fill", 0, 0, 16, 16)
+  love.graphics.setColor(colors.font.dark)
+  love.graphics.print("X", 2.5, 4.5)
+  love.graphics.setColor(colors.win.light)
+  love.graphics.setLineWidth(2)
+  love.graphics.line(0, 16, 0, 0, 16, 0)
+  love.graphics.setColor(colors.win.dark)
+  love.graphics.line(0, 16, 16, 16, 16, 0)
+  love.graphics.setCanvas()
+  ---
+  love.graphics.setCanvas(window.min)
+  love.graphics.setColor(colors.win.normal)
+  love.graphics.rectangle("fill", 0, 0, 16, 16)
+  love.graphics.setColor(70,70,70)
+  love.graphics.setLineWidth(3)
+  love.graphics.line(3, 8, 13, 8)
+  love.graphics.setColor(colors.win.light)
+  love.graphics.setLineWidth(2)
+  love.graphics.line(0, 16, 0, 0, 16, 0)
+  love.graphics.setColor(colors.win.dark)
+  love.graphics.line(0, 16, 16, 16, 16, 0)
+  love.graphics.setCanvas()
+  --
+  love.graphics.setCanvas(window.bar)
+  love.graphics.setColor(256, 256, 256)
+  love.graphics.draw(window.barAsset, 0, 0)
+  love.graphics.setCanvas()
+end
+function drawUpBox(x, y, w, h, t)
+  love.graphics.setColor(colors.win.normal)
+  love.graphics.rectangle("fill", x, y, w, h)
+  love.graphics.setLineWidth(t)
+  love.graphics.setColor(colors.win.light)
+  love.graphics.line(x, y+h, x, y, x+w, y)
+  love.graphics.setColor(colors.win.dark)
+  love.graphics.line(x, y+h, x+w, y+h, x+w, y)
+end
+function drawDownBox(x, y, w, h, t)
+  love.graphics.setColor(colors.win.normal)
+  love.graphics.rectangle("fill", x, y, w, h)
+  love.graphics.setLineWidth(t)
+  love.graphics.setColor(colors.win.dark)
+  love.graphics.line(x, y+h, x, y, x+w, y)
+  love.graphics.setColor(colors.win.light)
+  love.graphics.line(x, y+h, x+w, y+h, x+w, y)
+end
+function drawBlueBox(x, y, w, h, t)
+  love.graphics.setColor(0, 0, 120)
+  love.graphics.rectangle("fill", x, y, w, h)
+  love.graphics.setLineWidth(t)
+  love.graphics.setColor(0,0,180)
+  love.graphics.line(x, y+h, x, y, x+w, y)
+  love.graphics.setColor(0, 0, 80)
+  love.graphics.line(x, y+h, x+w, y+h, x+w, y)
+end
diff --git a/main.lua b/main.lua
index b443a85..2265505 100644
--- a/main.lua
+++ b/main.lua
@@ -13,6 +13,7 @@ function love.load()
   require "settings"
   require "system"
   require "loading"
+  require "elements"
   love.graphics.setDefaultFilter("nearest", "nearest")
   love.graphics.setBackgroundColor(0, 0, 0)
   love.graphics.setNewFont()
@@ -21,6 +22,7 @@ function love.load()
   love.graphics.setFont(pressstart)
   loadAssets()
   loadVar()
+  loadElements()
 end
 function love.update(dt)
   sys.w = love.graphics.getWidth()
diff --git a/panel.lua b/panel.lua
index 5e381a1..8b153f7 100644
--- a/panel.lua
+++ b/panel.lua
@@ -1,7 +1,11 @@
 function drawPanelButton(id)
   love.graphics.setColor(150, 150, 150)
   if panel.b[id] ~= 0 then
-    love.graphics.rectangle("line", panel.s.x+72+(137*id-137), panel.s.y, panel.s.width*2, panel.s.height)
+    if layer[1] == panel.b[id] and win[panel.b[id]].min == false then
+      drawDownBox(panel.s.x+72+(137*id-137), panel.s.y, panel.s.width*2, panel.s.height, 2)
+    else
+      drawUpBox(panel.s.x+72+(137*id-137), panel.s.y, panel.s.width*2, panel.s.height, 2)
+    end
     love.graphics.setColor(70,70,70)
     love.graphics.print(win[panel.b[id]].title, panel.s.x+4+77+(137*id-137), panel.s.y+7)
     if (sys.mouse.p.p == true and sys.mouse.p.x >= panel.s.x+72+(137*id-137)
@@ -28,7 +32,11 @@ function drawStart()
   love.graphics.setLineWidth(2)
   love.graphics.line(panel.x, panel.y, panel.width, panel.y)
   love.graphics.setColor(150, 150, 150)
-  love.graphics.rectangle("line", panel.s.x, panel.s.y, panel.s.width, panel.s.height)
+  if start.o == true then
+    drawDownBox(panel.s.x, panel.s.y, panel.s.width, panel.s.height, 2)
+  else
+    drawUpBox(panel.s.x, panel.s.y, panel.s.width, panel.s.height, 2)
+  end
   love.graphics.setColor(70,70,70)
   love.graphics.print("START", panel.s.x+4, panel.s.y+7)
   drawPanelButton(1)
diff --git a/var.lua b/var.lua
index 60cac62..4b98fa4 100644
--- a/var.lua
+++ b/var.lua
@@ -91,4 +91,11 @@ function loadVar()
   antivirus.prog = 0
   antivirus.status = "Not Scanning"
   antivirus.scanning = false
+  colors = {}
+  colors.win = {}
+  colors.win.light = {220,220,220}
+  colors.win.dark = {150,150,150}
+  colors.win.normal = {192,192,192}
+  colors.font = {}
+  colors.font.dark = {70,70,70}
 end
diff --git a/window.lua b/window.lua
index 150cd65..53a4ac2 100644
--- a/window.lua
+++ b/window.lua
@@ -8,17 +8,10 @@ function drawWindow(id)
     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(256,256,256)
+    love.graphics.draw(window.bar, 0+3, 0+3, 0, (win[id].w-7)/643, 1) --Blue Bar
+    love.graphics.draw(window.x, 0+win[id].w-22, 5)
+    love.graphics.draw(window.min, 0+win[id].w-40, 0+5) --Minimize Button
     love.graphics.setColor(220, 220, 220)
     love.graphics.print(win[id].title, 0+6, 0+9) --Title
     if id == 4 then