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

修复key控件右对齐代码错误和slider控件一定会有obj属性，整理代码

Browse Source
This commit is contained in:
MrZ626
2021-04-22 17:44:15 +08:00
parent c9109986d1
commit 5b22712058
1 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
Zframework/widget.lua
View File

@@ -9,10 +9,12 @@ local COLOR=COLOR
local setFont,mStr=setFont,mStr local setFont,mStr=setFont,mStr
local mDraw_X,mDraw_Y=ADRAW.simpX,ADRAW.simpY local mDraw_X,mDraw_Y=ADRAW.simpX,ADRAW.simpY
local allowNoText={ local mustHaveText={
image=true, text=true,
inputBox=true, button=true,
textBox=true, key=true,
switch=true,
selector=true,
} }
local WIDGET={} local WIDGET={}
@@ -40,13 +42,12 @@ function text:draw()
if self.alpha>0 then if self.alpha>0 then
local c=self.color local c=self.color
gc.setColor(c[1],c[2],c[3],self.alpha) gc.setColor(c[1],c[2],c[3],self.alpha)
local obj=self.obj
if self.align=="M"then if self.align=="M"then
mDraw_X(obj,self.x,self.y) mDraw_X(self.obj,self.x,self.y)
elseif self.align=="L"then elseif self.align=="L"then
gc.draw(obj,self.x,self.y) gc.draw(self.obj,self.x,self.y)
elseif self.align=="R"then elseif self.align=="R"then
gc.draw(obj,self.x-obj:getWidth(),self.y) gc.draw(self.obj,self.x-self.obj:getWidth(),self.y)
end end
end end
end end
@@ -270,7 +271,7 @@ function key:draw()
elseif self.align=="L"then elseif self.align=="L"then
mDraw_Y(self.obj,x+self.edge,y+h*.5) mDraw_Y(self.obj,x+self.edge,y+h*.5)
elseif self.align=="R"then elseif self.align=="R"then
mDraw_Y(self.obj,self.x-self.edge-self.obj:getWidth(),y+h*.5) mDraw_Y(self.obj,x+w-self.edge-self.obj:getWidth(),y+h*.5)
end end
end end
function key:getInfo() function key:getInfo()
@@ -356,9 +357,8 @@ function switch:draw()
gc.rectangle("line",x,y,50,50) gc.rectangle("line",x,y,50,50)
--Drawable --Drawable
local obj=self.obj
gc.setColor(self.color) gc.setColor(self.color)
mDraw_Y(obj,x-12-ATV-obj:getWidth(),y+25) mDraw_Y(self.obj,x-12-ATV-self.obj:getWidth(),y+25)
end end
function switch:getInfo() function switch:getInfo()
return format("x=%d,y=%d,font=%d",self.x,self.y,self.font) return format("x=%d,y=%d,font=%d",self.x,self.y,self.font)
@@ -478,9 +478,10 @@ function slider:draw()
end end
--Drawable --Drawable
local obj=self.obj if self.obj then
gc.setColor(self.color) gc.setColor(self.color)
mDraw_Y(obj,x-12-ATV-obj:getWidth(),y) mDraw_Y(self.obj,x-12-ATV-self.obj:getWidth(),y)
end
end end
function slider:getInfo() function slider:getInfo()
return format("x=%d,y=%d,w=%d",self.x,self.y,self.w) return format("x=%d,y=%d,w=%d",self.x,self.y,self.w)
@@ -757,9 +758,8 @@ function inputBox:draw()
--Drawable --Drawable
setFont(self.font) setFont(self.font)
local obj=self.obj if self.obj then
if obj then mDraw_Y(self.obj,x-12-self.obj:getWidth(),y+h*.5)
mDraw_Y(obj,x-12-obj:getWidth(),y+h*.5)
end end
if self.secret then if self.secret then
for i=1,#self.value do for i=1,#self.value do
@@ -1016,7 +1016,7 @@ function WIDGET.setLang(widgetText)
if L.widgetList then if L.widgetList then
for _,W in next,L.widgetList do for _,W in next,L.widgetList do
local t=W.fText or widgetText[S][W.name] local t=W.fText or widgetText[S][W.name]
if not t and not allowNoText[W.type]then if not t and mustHaveText[W.type]then
t=W.name or"##" t=W.name or"##"
W.color=COLOR.dV W.color=COLOR.dV
end end