Changed X/Min button from canvas to function

3 files changed, 15 insertions, 21 deletions

diff --git a/elements.lua b/elements.lua
index 07fb37e..51ee023 100644
--- a/elements.lua
+++ b/elements.lua
@@ -1,30 +1,25 @@
-function loadElements()
-  window.x = love.graphics.newCanvas(16, 16)
-  window.min = love.graphics.newCanvas(16, 16)
-  love.graphics.setCanvas(window.x)
+function drawXBox(x, y)
   love.graphics.setColor(colors.win.normal)
-  love.graphics.rectangle("fill", 0, 0, 16, 16)
+  love.graphics.rectangle("fill", x, y, 16, 16)
   love.graphics.setColor(colors.font.dark)
-  love.graphics.print("X", 2.5, 4.5)
+  love.graphics.print("X", x+2.5, y+4.5)
   love.graphics.setColor(colors.win.light)
-  love.graphics.setLineWidth(2)
-  love.graphics.line(0, 16, 0, 0, 16, 0)
+  love.graphics.setLineWidth(1)
+  love.graphics.line(x, y+16, x, y, x+16, y)
   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.line(x, y+16, x+16, y+16, x+16, y)
+end
+function drawMinBox(x, y)
   love.graphics.setColor(colors.win.normal)
-  love.graphics.rectangle("fill", 0, 0, 16, 16)
+  love.graphics.rectangle("fill", x, y, 16, 16)
   love.graphics.setColor(colors.font.dark)
   love.graphics.setLineWidth(3)
-  love.graphics.line(3, 8, 13, 8)
+  love.graphics.line(x+3, y+8, x+13, y+8)
   love.graphics.setColor(colors.win.light)
-  love.graphics.setLineWidth(2)
-  love.graphics.line(0, 16, 0, 0, 16, 0)
+  love.graphics.setLineWidth(1)
+  love.graphics.line(x, y+16, x, y, x+16, y)
   love.graphics.setColor(colors.win.dark)
-  love.graphics.line(0, 16, 16, 16, 16, 0)
-  love.graphics.setCanvas()
+  love.graphics.line(x, y+16, x+16, y+16, x+16, y)
 end
 function drawUpBox(x, y, w, h, t)
   love.graphics.setColor(colors.win.normal)
diff --git a/main.lua b/main.lua
index 2265505..84a8202 100644
--- a/main.lua
+++ b/main.lua
@@ -22,7 +22,6 @@ function love.load()
   love.graphics.setFont(pressstart)
   loadAssets()
   loadVar()
-  loadElements()
 end
 function love.update(dt)
   sys.w = love.graphics.getWidth()
diff --git a/window.lua b/window.lua
index 4b8710d..d34a04a 100644
--- a/window.lua
+++ b/window.lua
@@ -9,8 +9,8 @@ function drawWindow(id)
     else
       love.graphics.draw(window.barGrey, 0+3, 0+3, 0, (win[id].w-7)/643, 1)
     end
-    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
+    drawXBox(win[id].w-22, 5)
+    drawMinBox(win[id].w-40, 0+5) --Minimize Button
     love.graphics.setColor(240, 240, 240)
     love.graphics.print(win[id].title, 28, 0+9) --Title
     love.graphics.setColor(256, 256, 256)