aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author1029chris <1029chris@gmail.com>2016-04-12 13:00:45 -0700
committer1029chris <1029chris@gmail.com>2016-04-12 13:00:45 -0700
commit598a49db946322ac729c722924d1ecbdd6c4e5ce (patch)
tree9305303e1e4a6762270c7cdb2d1ded7fc2027d6b
parent1b6abae83cf3c9f31f25f63d3dba75af69728962 (diff)
Moved start menu activation to panel.lua
-rw-r--r--panel.lua11
-rw-r--r--system.lua11
2 files changed, 11 insertions, 11 deletions
diff --git a/panel.lua b/panel.lua
index 05cf61f..79ba3cf 100644
--- a/panel.lua
+++ b/panel.lua
@@ -47,4 +47,15 @@ function drawStart()
drawPanelButton(4)
drawPanelButton(5)
drawPanelButton(6)
+ 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
+ start.p = true
+ if start.o == true then
+ start.o = false
+ elseif start.o == false then
+ start.o = true
+ sendMessage(1, msgs[msg.c])
+ end
+ end
end
diff --git a/system.lua b/system.lua
index 3295510..24ac76c 100644
--- a/system.lua
+++ b/system.lua
@@ -12,17 +12,6 @@ function drawSystem()
and win[4].hov == false and win[5].hov == false and win[6].hov == false) then
winHover = false
end
- 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
- start.p = true
- if start.o == true then
- start.o = false
- elseif start.o == false then
- start.o = true
- sendMessage(1, msgs[msg.c])
- end
- end
if start.o == true and sys.mouse.p.p == true and sys.mouse.p.x > 255 or sys.mouse.p.y < sys.h-380 then
start.o = false
end