Added small icons (plus antivirus icon), added inactive grey bar, fixed stuff.

1 files changed, 11 insertions, 9 deletions

diff --git a/panel.lua b/panel.lua
index 8b153f7..44a841f 100644
--- a/panel.lua
+++ b/panel.lua
@@ -2,14 +2,16 @@ function drawPanelButton(id)
   love.graphics.setColor(150, 150, 150)
   if panel.b[id] ~= 0 then
     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)
+      drawDownBox(panel.s.x+72+(panel.s.dis*id-panel.s.dis), panel.s.y, panel.s.width*3, panel.s.height, 2)
     else
-      drawUpBox(panel.s.x+72+(137*id-137), panel.s.y, panel.s.width*2, panel.s.height, 2)
+      drawUpBox(panel.s.x+72+(panel.s.dis*id-panel.s.dis), panel.s.y, panel.s.width*3, 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)
-    and sys.mouse.p.x <= (panel.s.x+72+(137*id-137))+(panel.s.width*2)
+    love.graphics.print(win[panel.b[id]].title, panel.s.x+4+90+(panel.s.dis*id-panel.s.dis), panel.s.y+7)
+    love.graphics.setColor(256,256,256)
+    love.graphics.draw(win[panel.b[id]].icon16, panel.s.x+4+72+(panel.s.dis*id-panel.s.dis), panel.s.y+2)
+    if (sys.mouse.p.p == true and sys.mouse.p.x >= panel.s.x+72+(panel.s.dis*id-panel.s.dis)
+    and sys.mouse.p.x <= (panel.s.x+72+(panel.s.dis*id-panel.s.dis))+(panel.s.width*3)
     and sys.mouse.p.y >= panel.s.y and sys.mouse.p.y <= panel.s.y+panel.s.height) then
       if win[panel.b[id]].min == false then
         layer.sentToFront = panel.b[id]
@@ -26,18 +28,18 @@ function drawStart()
   panel.y = love.graphics.getHeight()
   panel.y = panel.y - panel.thick
   panel.s.y = panel.y + 5
-  love.graphics.setColor(192, 192, 192)
+  love.graphics.setColor(colors.win.normal)
   love.graphics.rectangle("fill", panel.x, panel.y, panel.width, panel.height)
-  love.graphics.setColor(220, 220, 220)
+  love.graphics.setColor(colors.win.light)
   love.graphics.setLineWidth(2)
   love.graphics.line(panel.x, panel.y, panel.width, panel.y)
-  love.graphics.setColor(150, 150, 150)
+  love.graphics.setColor(colors.win.dark)
   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.setColor(colors.font.dark)
   love.graphics.print("START", panel.s.x+4, panel.s.y+7)
   drawPanelButton(1)
   drawPanelButton(2)