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

text控件增加plain属性

Browse Source
This commit is contained in:
MrZ626
2020-12-28 17:53:23 +08:00
parent b769d1b1d5
commit 4800afa0db
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Zframework/widget.lua
View File

@@ -18,13 +18,15 @@ local text={
alpha=0, alpha=0,
} }
function text:reset() function text:reset()
if type(self.text)=="string"then if not self.plain and type(self.text)=="string"then
self.text=gc.newText(getFont(self.font),self.text) self.text=gc.newText(getFont(self.font),self.text)
elseif type(self.text)~="userdata"or self.text.type(self.text)~="Text"then elseif type(self.text)~="userdata"or self.text.type(self.text)~="Text"then
self.text=gc.newText(getFont(self.font),self.name) self.text=gc.newText(getFont(self.font),self.name)
if not self.plain then
self.color=COLOR.dPurple self.color=COLOR.dPurple
self.font=self.font-10 self.font=self.font-10
end end
end
end end
function text:update() function text:update()
if self.hideCon and self.hideCon()then if self.hideCon and self.hideCon()then
@@ -48,7 +50,7 @@ function text:draw()
end end
end end
end end
function WIDGET.newText(D)--name,x,y[,color][,font=30][,align="M"][,hide] function WIDGET.newText(D)--name,x,y[,color][,font=30][,align="M"][,plain=false][,hide]
local _={ local _={
name= D.name, name= D.name,
x= D.x, x= D.x,
@@ -56,6 +58,7 @@ function WIDGET.newText(D)--name,x,y[,color][,font=30][,align="M"][,hide]
color= D.color and(COLOR[D.color]or D.color)or COLOR.white, color= D.color and(COLOR[D.color]or D.color)or COLOR.white,
font= D.font or 30, font= D.font or 30,
align= D.align or"M", align= D.align or"M",
plain= D.plain==true,
hideCon=D.hide, hideCon=D.hide,
} }
for k,v in next,text do _[k]=v end for k,v in next,text do _[k]=v end
@@ -777,7 +780,7 @@ function WIDGET.newTextBox(D)--name,x,y,w[,h][,font][,secret][,regex],hide
}, },
font= D.font or int(D.h/7-1)*5, font= D.font or int(D.h/7-1)*5,
secret= D.secret, secret= D.secret==true,
regex= D.regex, regex= D.regex,
hide= D.hide, hide= D.hide,
} }