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

修复文本框控件有一处可能触发的报错，整理代码

Browse Source
This commit is contained in:
MrZ626
2021-05-13 19:24:43 +08:00
parent 3e89edefdb
commit 38326bc3b6
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Zframework/widget.lua
View File

@@ -134,16 +134,6 @@ end
function button:getCenter() function button:getCenter()
return self.x+self.w*.5,self.y+self.h*.5 return self.x+self.w*.5,self.y+self.h*.5
end end
function button:FX()
local ATV=self.ATV
SYSFX.newRectRipple(
6,
self.x-ATV,
self.y-ATV,
self.w+2*ATV,
self.h+2*ATV
)
end
function button:update() function button:update()
local ATV=self.ATV local ATV=self.ATV
if WIDGET.sel==self then if WIDGET.sel==self then
@@ -198,7 +188,14 @@ function button:getInfo()
end end
function button:press(_,_,k) function button:press(_,_,k)
self.code(k) self.code(k)
self:FX() local ATV=self.ATV
SYSFX.newRectRipple(
6,
self.x-ATV,
self.y-ATV,
self.w+2*ATV,
self.h+2*ATV
)
if self.sound then SFX.play('button')end if self.sound then SFX.play('button')end
end end
function WIDGET.newButton(D)--name,x,y,w[,h][,fText][,color][,font=30][,sound=true][,align='M'][,edge=0],code[,hide] function WIDGET.newButton(D)--name,x,y,w[,h][,fText][,color][,font=30][,sound=true][,align='M'][,edge=0],code[,hide]
@@ -884,6 +881,7 @@ function textBox:push(t)
end end
end end
function textBox:press(x,y) function textBox:press(x,y)
if not(x and y)then return end
self:drag(nil,nil,nil,0) self:drag(nil,nil,nil,0)
if not self.fix and x>self.x+self.w-40 and y<self.y+40 then if not self.fix and x>self.x+self.w-40 and y<self.y+40 then
if self.sure>0 then if self.sure>0 then