Moved sort code to a function in window.lua

2 files changed, 69 insertions, 120 deletions

diff --git a/main.lua b/main.lua
index 488fb1c..0592895 100644
--- a/main.lua
+++ b/main.lua
@@ -40,126 +40,9 @@ function love.mousereleased(x, y, button)
 end
 function love.draw()
   drawDesktop()
-  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]
-    elseif panel.b[3] == 1 then
-      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
-      win[1].layer = 1
-    end
-    if layer[1] == 2 and win[1].layer == 1 then
-      layer[2] = 2
-      layer[1] = 1
-      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]
-    elseif panel.b[3] == 2 then
-      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
-      win[2].layer = 1
-    end
-    if layer[1] == 1 and win[2].layer == 1 then
-      layer[2] = 1
-      layer[1] = 2
-      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 win[3].ex == true and win[3].s == 0 then
-    win[3].layer = 0
-    win[3].panel = 0
-    if panel.b[1] == 3 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] == 3 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]
-    elseif panel.b[3] == 3 then
-      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[3].ex == false or win[3].s ~= 0 then
-    if layer[1] == 0 then
-      layer[1] = 3
-      win[3].layer = 1
-    end
-    if layer[1] == 2 and win[3].layer == 1 then
-      layer[2] = 2
-      layer[1] = 3
-      win[3].layer = 1
-      win[2].layer = 2
-    end
-    if panel.b[1] == 0 then
-      panel.b[1] = 3
-    elseif panel.b[2] == 0 and panel.b[1] ~= 3 then
-      panel.b[2] = 3
-    end
-    drawWindow(3)
-  end
+  orderWindow(1)
+  orderWindow(2)
+  orderWindow(3)
   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
diff --git a/window.lua b/window.lua
index 49f780b..100e8f8 100644
--- a/window.lua
+++ b/window.lua
@@ -70,3 +70,69 @@ function drawWindow(id)
   end
   love.graphics.setColor(255,255,255)
 end
+function orderWindow(id)
+  if win[id].ex == true and win[id].s == 0 then
+    win[id].layer = 0
+    win[id].panel = 0
+    if panel.b[1] == id 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] == id 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]
+    elseif panel.b[3] == id then
+      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[id].ex == false or win[id].s ~= 0 then
+    if layer[1] == 0 then
+      layer[1] = id
+      win[id].layer = 1
+    end
+    if layer[1] ~= id and win[id].layer == 1 then
+      layer[7] = layer[6]
+      layer[6] = layer[5]
+      layer[5] = layer[4]
+      layer[4] = layer[3]
+      layer[3] = layer[2]
+      layer[2] = layer[1]
+      layer[1] = id
+      win[id].layer = 1
+      if layer[7] ~= 0 then
+        win[layer[7]].layer = 7
+      end
+      if layer[6] ~= 0 then
+        win[layer[6]].layer = 6
+      end
+      if layer[5] ~= 0 then
+        win[layer[5]].layer = 5
+      end
+      if layer[4] ~= 0 then
+        win[layer[4]].layer = 4
+      end
+      if layer[3] ~= 0 then
+        win[layer[3]].layer = 3
+      end
+      if layer[2] ~= 0 then
+        win[layer[2]].layer = 2
+      end
+    end
+    if panel.b[1] == 0 then
+      panel.b[1] = id
+    elseif panel.b[2] == 0 and panel.b[1] ~= id then
+      panel.b[2] = id
+    elseif panel.b[3] == 0 and panel.b[1] ~= id and panel.b[2] ~= id then
+      panel.b[3] = id
+    end
+    drawWindow(id)
+  end
+end