mirrors/ldd-CC
1
0
Fork 0
mirror of https://github.com/LDDestroier/CC/ synced 2024-12-04 23:39:58 +00:00
Code Issues Releases Wiki Activity

Fixed crash when pushing key on color picker

Browse Source 
I can't believe it took Noodle for me to notice this issue
This commit is contained in:
LDDestroier 2019-10-18 02:51:39 -04:00 committed by GitHub
parent f7d040e6aa
commit a5e0d08f72
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 30 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
pain.lua
View File

@ -3057,6 +3057,7 @@ local getInput = function() --gotta catch them all
miceDown[button] = true
if y <= scr_y-(plc.renderBlittle and 0 or doRenderBar) then
if (button == 3) then
renderBottomBar("Type text onto canvas:")
putDownText(x,y)
miceDown = {}
keysDown = {}
@ -3310,6 +3311,7 @@ local getInput = function() --gotta catch them all
x = 2*x
y = 3*y
end
renderBottomBar("Type text onto canvas:")
putDownText(x,y)
miceDown = {}
keysDown = {}
@ -3342,31 +3344,36 @@ local getInput = function() --gotta catch them all
renderBottomBar("Pick color with cursor:")
paintEncoded = clearAllRedundant(paintEncoded)
local mevt
repeat
mevt = {os.pullEvent()}
until (mevt[1] == "key" and mevt[2] == keys.x) or (mevt[2] == 1 and (mevt[4] or math.huge) <= scr_y)
if not (mevt[1] == "key" and mevt[2] == keys.x) then
local x, y = mevt[3]+paint.scrollX, mevt[4]+paint.scrollY
if plc.renderBlittle then
x = 2*x
y = 3*y
end
local p
for a = 1, #paintEncoded[frame] do
p = paintEncoded[frame][a]
if (p.x == x) and (p.y == y) then
paint.t = p.t or paint.t
paint.b = p.b or paint.b
paint.c = p.c or paint.c
paint.m = p.m or paint.m
miceDown = {}
keysDown = {}
doRender = true
isDragging = false
break
local keepPicking = true
while keepPicking do
mevt = {os.pullEvent()}
if mevt[1] == "mouse_click" then
keepPicking = false
resetInputState()
if mevt[4] < scr_y then
local x, y = mevt[3]+paint.scrollX, mevt[4]+paint.scrollY
if plc.renderBlittle then
x = 2*x
y = 3*y
end
local p
for a = 1, #paintEncoded[frame] do
p = paintEncoded[frame][a]
if (p.x == x) and (p.y == y) then
paint.t = p.t or paint.t
paint.b = p.b or paint.b
paint.c = p.c or paint.c
paint.m = p.m or paint.m
break
end
end
end
elseif mevt[1] == "key" then
if mevt[2] == keys.x or evt[2] == keys.q then
keepPicking = false
end
end
resetInputState()
end
doRender = true
isDragging = false