diff options
| author | Chris B <1029chris@gmail.com> | 2016-01-27 13:10:44 -0800 |
|---|---|---|
| committer | Chris B <1029chris@gmail.com> | 2016-01-27 13:10:44 -0800 |
| commit | fa53e98ad792c9c1128718f282d9b508b30e56f9 (patch) | |
| tree | ce6f77cfbdb63cccda5b427de105fb6e630f08db | |
| parent | 9e09ef17829abb61a18392fee06db6037664b3ee (diff) | |
Added panel buttons for different windows
| -rw-r--r-- | main.lua | 41 | ||||
| -rw-r--r-- | panel.lua | 20 | ||||
| -rw-r--r-- | var.lua | 10 |
3 files changed, 70 insertions, 1 deletions
@@ -34,6 +34,21 @@ end function love.draw() if win[1].ex == true and win[1].s == 0 then win[1].layer = 0 + win[1].panel = 0 + if panel.b[1] == 1 then + panel.b[1] = panel.b[2] + panel.b[2] = panel.b[3] + panel.b[3] = panel.b[4] + panel.b[4] = panel.b[5] + panel.b[5] = panel.b[6] + panel.b[6] = panel.b[7] + elseif panel.b[2] == 1 then + panel.b[2] = panel.b[3] + panel.b[3] = panel.b[4] + panel.b[4] = panel.b[5] + panel.b[5] = panel.b[6] + panel.b[6] = panel.b[7] + end elseif win[1].ex == false or win[1].s ~= 0 then if layer[1] == 0 then layer[1] = 1 @@ -45,10 +60,30 @@ function love.draw() win[1].layer = 1 win[2].layer = 2 end + if panel.b[1] == 0 then + panel.b[1] = 1 + elseif panel.b[2] == 0 and panel.b[1] ~= 1 then + panel.b[2] = 1 + end drawWindow(1) end if win[2].ex == true and win[2].s == 0 then win[1].layer = 0 + win[1].panel = 0 + if panel.b[1] == 2 then + panel.b[1] = panel.b[2] + panel.b[2] = panel.b[3] + panel.b[3] = panel.b[4] + panel.b[4] = panel.b[5] + panel.b[5] = panel.b[6] + panel.b[6] = panel.b[7] + elseif panel.b[2] == 2 then + panel.b[2] = panel.b[3] + panel.b[3] = panel.b[4] + panel.b[4] = panel.b[5] + panel.b[5] = panel.b[6] + panel.b[6] = panel.b[7] + end elseif win[2].ex == false or win[2].s ~= 0 then if layer[1] == 0 then layer[1] = 2 @@ -60,6 +95,11 @@ function love.draw() win[2].layer = 1 win[1].layer = 2 end + if panel.b[1] == 0 then + panel.b[1] = 2 + elseif panel.b[2] == 0 and panel.b[1] ~= 2 then + panel.b[2] = 2 + end drawWindow(2) end if(sys.mouse.p.p == true and start.p == false and sys.mouse.p.x >= panel.s.x @@ -85,5 +125,4 @@ function love.draw() if start.o == true then drawMenu() end - love.graphics.print(win[1].layer .. " " .. win[2].layer) end @@ -8,4 +8,24 @@ function drawStart() love.graphics.rectangle("line", panel.s.x, panel.s.y, panel.s.width, panel.s.height) love.graphics.setColor(70,70,70) love.graphics.print("START", panel.s.x+4, panel.s.y+7) + love.graphics.setColor(150, 150, 150) + if panel.b[1] ~= 0 then + love.graphics.rectangle("line", panel.s.x+72, panel.s.y, panel.s.width*2, panel.s.height) + love.graphics.setColor(70,70,70) + if panel.b[1] == 1 then + love.graphics.print("Chat", panel.s.x+4+72, panel.s.y+7) + elseif panel.b[1] == 2 then + love.graphics.print("Internet", panel.s.x+4+72, panel.s.y+7) + end + end + love.graphics.setColor(150, 150, 150) + if panel.b[2] ~= 0 then + love.graphics.rectangle("line", panel.s.x+72+70+67, panel.s.y, panel.s.width*2, panel.s.height) + love.graphics.setColor(70,70,70) + if panel.b[2] == 1 then + love.graphics.print("Chat", panel.s.x+4+72+70+67, panel.s.y+7) + elseif panel.b[2] == 2 then + love.graphics.print("Internet", panel.s.x+4+72+70+67, panel.s.y+7) + end + end end @@ -27,6 +27,14 @@ function loadVar() panel.s.width = 65 panel.s.height = 20 panel.s.activate = false + panel.b = {} + panel.b[1] = 0 + panel.b[2] = 0 + panel.b[3] = 0 + panel.b[4] = 0 + panel.b[5] = 0 + panel.b[6] = 0 + panel.b[7] = 0 test = false win = {} win[1] = {} @@ -44,6 +52,7 @@ function loadVar() win[1].miny = 0 win[1].title = "Chat" win[1].layer = 0 + win[1].panel = 0 win[2] = {} win[2].x = 100 win[2].y = 100 @@ -59,6 +68,7 @@ function loadVar() win[2].miny = 0 win[2].title = "Internet" win[2].layer = 0 + win[2].panel = 0 winOpen = true start = {} start.cvs = love.graphics.newCanvas(250, 350) |
