diff options
| author | 1029chris <1029chris@gmail.com> | 2016-02-18 11:43:04 -0800 |
|---|---|---|
| committer | 1029chris <1029chris@gmail.com> | 2016-02-18 11:43:04 -0800 |
| commit | 8ff1195e04e15d2b756d9ac2817463841361d6ba (patch) | |
| tree | 3ba87718487d7d34143ef5c0a90bbfa83c3240c6 /window.lua | |
| parent | dfa8516ef8c7ca37d06aade80f87578d09e575fd (diff) | |
Fixed layer appearing on top error
Diffstat (limited to 'window.lua')
| -rw-r--r-- | window.lua | 20 |
1 files changed, 11 insertions, 9 deletions
@@ -27,18 +27,20 @@ function drawWindow(id) else win[id].hov = false end - if win[id].layer ~= 1 and win[layer[1]].hov == true then - win[id].hover = false - elseif win[id].layer ~= 1 and win[id].layer ~= 2 and layer[1] ~= 0 and layer[2] ~= 0 then - if win[layer[1]].hov == true or win[layer[2]].hov == true then + if layer[1] ~= 0 then + if win[id].layer ~= 1 and win[layer[1]].hov == true then + win[id].hover = false + elseif win[id].layer ~= 1 and win[id].layer ~= 2 and layer[1] ~= 0 and layer[2] ~= 0 then + if win[layer[1]].hov == true or win[layer[2]].hov == true then + win[id].hover = false + else + win[id].hover = true + end + elseif win[id].hov == false then win[id].hover = false else win[id].hover = true end - elseif win[id].hov == false then - win[id].hover = false - else - win[id].hover = true end if win[id].hov == false then win[id].hover = false @@ -153,7 +155,7 @@ function orderWindow(id) panel.b[6] = panel.b[7] end elseif win[id].ex == false or win[id].s ~= 0 then - if layer[1] == 0 then + if layer[1] == 0 and layer[2] == id then layer[1] = id win[id].oldlayer = win[id].layer win[id].layer = 1 |