From e6bc567b12457d2e45f14536bc1dbe7c3f1f3299 Mon Sep 17 00:00:00 2001 From: MrZ626 <1046101471@qq.com> Date: Sun, 28 Nov 2021 04:56:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=A4=E7=A7=8D=E6=8C=89=E9=92=AE=E4=B8=8A?= =?UTF-8?q?=E7=9A=84=E6=96=87=E6=9C=AC=E4=B9=9F=E4=BC=9A=E6=8C=A4=E5=8E=8B?= =?UTF-8?q?=E7=BB=98=E5=88=B6=E4=BA=86=20=E4=BC=98=E5=8C=96=E6=8E=A7?= =?UTF-8?q?=E4=BB=B6=E7=BB=98=E5=88=B6=E6=80=A7=E8=83=BD=20=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3=E4=B8=A4=E4=B8=AA=E8=83=8C=E6=99=AF=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E4=BD=8D=E7=BD=AE=E9=94=99=E8=AF=AF=20?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B9=8B=E5=89=8D=E5=BF=98=E4=BA=86=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E7=9A=84=E8=AF=AD=E8=A8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Zframework/widget.lua | 54 ++++++++++++++++++---------------- parts/language/lang_en.lua | 6 ++-- parts/language/lang_es.lua | 6 ++-- parts/language/lang_fr.lua | 6 ++-- parts/language/lang_pt.lua | 6 ++-- parts/scenes/setting_video.lua | 4 +-- 6 files changed, 43 insertions(+), 39 deletions(-) diff --git a/Zframework/widget.lua b/Zframework/widget.lua index 6b3c2728..fc248e16 100644 --- a/Zframework/widget.lua +++ b/Zframework/widget.lua @@ -16,7 +16,6 @@ local next=next local int,ceil=math.floor,math.ceil local max,min=math.max,math.min local sub,ins,rem=string.sub,table.insert,table.remove -local mDraw,mDraw_X,mDraw_Y=GC.draw,GC.simpX,GC.simpY local xOy=SCR.xOy local FONT=FONT local mStr=GC.mStr @@ -74,7 +73,7 @@ function text:draw() local c=self.color gc_setColor(c[1],c[2],c[3],self.alpha) if self.align=='M'then - mDraw_X(self.obj,self.x,self.y) + gc_draw(self.obj,self.x-self.obj:getWidth()*.5,self.y) elseif self.align=='L'then gc_draw(self.obj,self.x,self.y) elseif self.align=='R'then @@ -181,32 +180,34 @@ function button:draw() --Drawable local obj=self.obj + local ox,oy=obj:getWidth()*.5,obj:getHeight()*.5 local y0=y+h*.5-ATV*.5 gc_setColor(1,1,1,.2+ATV*.05) if self.align=='M'then local x0=x+w*.5 - mDraw(obj,x0-1,y0-1) - mDraw(obj,x0-1,y0+1) - mDraw(obj,x0+1,y0-1) - mDraw(obj,x0+1,y0+1) + local kx=obj:type()=='Text'and min(w/ox/2,1)or 1 + gc_draw(obj,x0-1,y0-1,nil,kx,1,ox,oy) + gc_draw(obj,x0-1,y0+1,nil,kx,1,ox,oy) + gc_draw(obj,x0+1,y0-1,nil,kx,1,ox,oy) + gc_draw(obj,x0+1,y0+1,nil,kx,1,ox,oy) gc_setColor(r*.55,g*.55,b*.55) - mDraw(obj,x0,y0) + gc_draw(obj,x0,y0,nil,kx,1,ox,oy) elseif self.align=='L'then local edge=self.edge - mDraw_Y(obj,x+edge-1,y0-1) - mDraw_Y(obj,x+edge-1,y0+1) - mDraw_Y(obj,x+edge+1,y0-1) - mDraw_Y(obj,x+edge+1,y0+1) + gc_draw(obj,x+edge-1,y0-1-oy) + gc_draw(obj,x+edge-1,y0+1-oy) + gc_draw(obj,x+edge+1,y0-1-oy) + gc_draw(obj,x+edge+1,y0+1-oy) gc_setColor(r*.55,g*.55,b*.55) - mDraw_Y(obj,x+edge,y0) + gc_draw(obj,x+edge,y0-oy) elseif self.align=='R'then - local x0=x+w-self.edge-obj:getWidth() - mDraw_Y(obj,x0-1,y0-1) - mDraw_Y(obj,x0-1,y0+1) - mDraw_Y(obj,x0+1,y0-1) - mDraw_Y(obj,x0+1,y0+1) + local x0=x+w-self.edge-ox*2 + gc_draw(obj,x0-1,y0-1-oy) + gc_draw(obj,x0-1,y0+1-oy) + gc_draw(obj,x0+1,y0-1-oy) + gc_draw(obj,x0+1,y0+1-oy) gc_setColor(r*.55,g*.55,b*.55) - mDraw_Y(obj,x0,y0) + gc_draw(obj,x0,y0-oy) end end function button:getInfo() @@ -311,11 +312,11 @@ function key:draw() if self.fShade then gc_setColor(r,g,b,ATV*.25) if align=='M'then - mDraw(self.fShade,x+w*.5,y+h*.5) + gc_draw(self.fShade,x+w*.5-self.fShade:getWidth()*.5,y+h*.5-self.fShade:getHeight()*.5) elseif align=='L'then - mDraw_Y(self.fShade,x+self.edge,y+h*.5) + gc_draw(self.fShade,x+self.edge,y+h*.5-self.fShade:getHeight()*.5) elseif align=='R'then - mDraw_Y(self.fShade,x+w-self.edge-self.fShade:getWidth(),y+h*.5) + gc_draw(self.fShade,x+w-self.edge-self.fShade:getWidth(),y+h*.5-self.fShade:getHeight()*.5) end else gc_setColor(1,1,1,ATV*.05) @@ -323,13 +324,16 @@ function key:draw() end --Drawable + local obj=self.obj + local ox,oy=obj:getWidth()*.5,obj:getHeight()*.5 gc_setColor(r,g,b) if align=='M'then - mDraw(self.obj,x+w*.5,y+h*.5) + local kx=obj:type()=='Text'and min(w/ox/2,1)or 1 + gc_draw(obj,x+w*.5,y+h*.5,nil,kx,1,ox,oy) elseif align=='L'then - mDraw_Y(self.obj,x+self.edge,y+h*.5) + gc_draw(obj,x+self.edge,y-oy+h*.5) elseif align=='R'then - mDraw_Y(self.obj,x+w-self.edge-self.obj:getWidth(),y+h*.5) + gc_draw(obj,x+w-self.edge-ox*2,y-oy+h*.5) end end function key:getInfo() @@ -870,7 +874,7 @@ function inputBox:draw() local f=self.font FONT.set(f,self.fType) if self.obj then - mDraw_Y(self.obj,x-12-self.obj:getWidth(),y+h*.5) + gc_draw(self.obj,x-12-self.obj:getWidth(),y+h*.5-self.obj:getHeight()*.5) end if self.secret then y=y+h*.5-f*.2 diff --git a/parts/language/lang_en.lua b/parts/language/lang_en.lua index 6c820e71..0fdb008a 100644 --- a/parts/language/lang_en.lua +++ b/parts/language/lang_en.lua @@ -392,9 +392,9 @@ return{ clean="Quick Draw", fullscreen="Fullscreen", - bg_on="Normal Backgrounds", - bg_off="No Background", - bg_custom="Apply Custom BG", + bg_on="Normal B.G.", + bg_off="No B.G.", + bg_custom="Use Custom B.G.", blockSatur="Block Saturation", fieldSatur="Field Saturation", diff --git a/parts/language/lang_es.lua b/parts/language/lang_es.lua index 81e38193..dff46d10 100644 --- a/parts/language/lang_es.lua +++ b/parts/language/lang_es.lua @@ -358,9 +358,9 @@ return{ clean="Fast Draw", fullscreen="Pant. Completa", - -- bg_on="Normal Backgrounds", - -- bg_off="No Background", - -- bg_custom="Apply Custom BG", + -- bg_on="Normal B.G.", + -- bg_on="No B.G.", + -- bg_custom="Use Custom B.G.", blockSatur="Saturac. de los Bloques", fieldSatur="Saturac. del Tablero", diff --git a/parts/language/lang_fr.lua b/parts/language/lang_fr.lua index d6efc6b7..3ae2067b 100644 --- a/parts/language/lang_fr.lua +++ b/parts/language/lang_fr.lua @@ -356,9 +356,9 @@ return{ -- clean="Fast Draw", fullscreen="Plein écran", - -- bg_on="Normal Backgrounds", - -- bg_off="No Background", - -- bg_custom="Apply Custom BG", + -- bg_on="Normal B.G.", + -- bg_on="No B.G.", + -- bg_custom="Use Custom B.G.", -- blockSatur="Block Saturation", -- fieldSatur="Field Saturation", diff --git a/parts/language/lang_pt.lua b/parts/language/lang_pt.lua index 2a3d61be..8970f9f3 100644 --- a/parts/language/lang_pt.lua +++ b/parts/language/lang_pt.lua @@ -380,9 +380,9 @@ return{ -- clean="Fast Draw", fullscreen="Tela cheia", - -- bg_on="Normal Backgrounds", - -- bg_off="No Background", - -- bg_custom="Apply Custom BG", + -- bg_on="Normal B.G.", + -- bg_on="No B.G.", + -- bg_custom="Use Custom B.G.", -- blockSatur="Block Saturation", -- fieldSatur="Field Saturation", diff --git a/parts/scenes/setting_video.lua b/parts/scenes/setting_video.lua index fb164259..89a2e4d4 100644 --- a/parts/scenes/setting_video.lua +++ b/parts/scenes/setting_video.lua @@ -80,8 +80,8 @@ scene.widgetList={ WIDGET.newSwitch{name='clean', x=950,y=1160,lim=360,disp=SETval('cleanCanvas'), code=SETrev('cleanCanvas')}, WIDGET.newSwitch{name='fullscreen', x=950,y=1250,lim=360,disp=SETval('fullscreen'), code=function()SETTING.fullscreen=not SETTING.fullscreen applyFullscreen()end}, - WIDGET.newKey{name='bg_on', x=900,y=1340,w=200,h=80,code=function()SETTING.bg='on'applyBG()end}, - WIDGET.newKey{name='bg_off', x=680,y=1340,w=200,h=80,code=function()SETTING.bg='off'applyBG()end}, + WIDGET.newKey{name='bg_on', x=680,y=1340,w=200,h=80,code=function()SETTING.bg='on'applyBG()end}, + WIDGET.newKey{name='bg_off', x=900,y=1340,w=200,h=80,code=function()SETTING.bg='off'applyBG()end}, WIDGET.newKey{name='bg_custom', x=1120,y=1340,w=200,h=80, code=function() if love.filesystem.getInfo('conf/customBG')then