SweetSea/Techmino
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复画图切换到custom可返回bug，二者之间切换样式更换

Browse Source
This commit is contained in:
MrZ_26
2020-08-09 01:30:53 +08:00
parent 243fa72f98
commit a3ecfeb59a
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Zframework/init.lua
View File

@@ -328,7 +328,7 @@ function keyDown.custom(key)
elseif key=="q"then elseif key=="q"then
SCN.goto("sequence") SCN.goto("sequence")
elseif key=="e"then elseif key=="e"then
SCN.swapTo("draw") SCN.swapTo("draw","swipe")
elseif #key==1 then elseif #key==1 then
local T=tonumber(key) local T=tonumber(key)
if T and T>=1 and T<=5 then if T and T>=1 and T<=5 then
@@ -468,7 +468,7 @@ function keyDown.draw(key)
preField[sy][sx]=pen preField[sy][sx]=pen
end end
elseif key=="e"then elseif key=="e"then
SCN.swapTo("custom") SCN.swapTo("custom","swipe")
elseif key=="escape"then elseif key=="escape"then
SCN.back() SCN.back()
elseif key=="c"and kb.isDown("lctrl","rctrl")or key=="cC"then elseif key=="c"and kb.isDown("lctrl","rctrl")or key=="cC"then

2
Zframework/widgetList.lua
View File

@@ -203,7 +203,7 @@ local Widgets={
newSwitch({name="demo", x=755, y=640, font=30,disp=function()return sceneTemp.demo end,code=function()sceneTemp.demo=not sceneTemp.demo end}), newSwitch({name="demo", x=755, y=640, font=30,disp=function()return sceneTemp.demo end,code=function()sceneTemp.demo=not sceneTemp.demo end}),
newButton({name="copy", x=920, y=640, w=120, h=120, color="lRed", font=35,code=pressKey("cC")}), newButton({name="copy", x=920, y=640, w=120, h=120, color="lRed", font=35,code=pressKey("cC")}),
newButton({name="paste", x=1060, y=640, w=120, h=120, color="lBlue", font=35,code=pressKey("cV")}), newButton({name="paste", x=1060, y=640, w=120, h=120, color="lBlue", font=35,code=pressKey("cV")}),
newButton({name="custom", x=110, y=80, w=140, h=80, color="white", font=35,code=function()SCN.goto("custom")end}), newButton({name="custom", x=110, y=80, w=140, h=80, color="white", font=35,code=pressKey("e")}),
newButton({name="back", x=1200, y=640, w=120, h=120, color="white", font=35,code=BACK}), newButton({name="back", x=1200, y=640, w=120, h=120, color="white", font=35,code=BACK}),
}, },
play={ play={