From ecd8354d8fb35810997a0a33da428ae7f09ec1e7 Mon Sep 17 00:00:00 2001
From: MrZ626 <1046101471@qq.com>
Date: Wed, 13 Jan 2021 01:19:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A7=E4=BB=B6=E6=94=AF=E6=8C=81=E5=BC=BA?=
 =?UTF-8?q?=E5=88=B6=E6=96=87=E6=9C=AC=EF=BC=8C=E4=B8=8D=E9=9A=8F=E8=AF=AD?=
 =?UTF-8?q?=E8=A8=80=E5=8F=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Zframework/widget.lua | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/Zframework/widget.lua b/Zframework/widget.lua
index 49e8f1c8..e231652c 100644
--- a/Zframework/widget.lua
+++ b/Zframework/widget.lua
@@ -50,11 +50,13 @@ function text:draw()
 		end
 	end
 end
-function WIDGET.newText(D)--name,x,y[,color][,font=30][,align="M"][,plain=false][,hide]
+function WIDGET.newText(D)--name,x,y[,fText][,color][,font=30][,align="M"][,plain=false][,hide]
 	local _={
 		name=	D.name,
 		x=		D.x,
 		y=		D.y,
+
+		fText=	D.fText,
 		color=	D.color and(COLOR[D.color]or D.color)or COLOR.white,
 		font=	D.font or 30,
 		align=	D.align or"M",
@@ -166,7 +168,7 @@ function button:press()
 	self:FX()
 	SFX.play("button")
 end
-function WIDGET.newButton(D)--name,x,y,w[,h][,color][,font],code[,hide]
+function WIDGET.newButton(D)--name,x,y,w[,h][,fText][,color][,font],code[,hide]
 	if not D.h then D.h=D.w end
 	local _={
 		name=	D.name,
@@ -184,6 +186,7 @@ function WIDGET.newButton(D)--name,x,y,w[,h][,color][,font],code[,hide]
 			D.x+D.w*.35,D.y+D.h*.35,
 		},
 
+		fText=	D.fText,
 		color=	D.color and(COLOR[D.color]or D.color)or COLOR.white,
 		font=	D.font or 30,
 		code=	D.code,
@@ -247,7 +250,7 @@ end
 function key:press()
 	self.code()
 end
-function WIDGET.newKey(D)--name,x,y,w[,h][,color][,font],code[,hide]
+function WIDGET.newKey(D)--name,x,y,w[,h][,fText][,color][,font],code[,hide]
 	if not D.h then D.h=D.w end
 	local _={
 		name=	D.name,
@@ -265,6 +268,7 @@ function WIDGET.newKey(D)--name,x,y,w[,h][,color][,font],code[,hide]
 			D.x+D.w*.35,D.y+D.h*.35,
 		},
 
+		fText=	D.fText,
 		color=	D.color and(COLOR[D.color]or D.color)or COLOR.white,
 		font=	D.font or 30,
 		code=	D.code,
@@ -335,7 +339,7 @@ function switch:press()
 	self.code()
 	SFX.play("move")
 end
-function WIDGET.newSwitch(D)--name,x,y[,color][,font][,disp],code,hide
+function WIDGET.newSwitch(D)--name,x,y[,fText][,color][,font][,disp],code,hide
 	local _={
 		name=	D.name,
 
@@ -346,6 +350,7 @@ function WIDGET.newSwitch(D)--name,x,y[,color][,font][,disp],code,hide
 			D.x+25,D.y,
 		},
 
+		fText=	D.fText,
 		color=	D.color and(COLOR[D.color]or D.color)or COLOR.white,
 		font=	D.font or 30,
 		disp=	D.disp,
@@ -486,7 +491,7 @@ function slider:arrowKey(isLeft)
 		self.change()
 	end
 end
-function WIDGET.newSlider(D)--name,x,y,w[,color][,unit][,smooth][,font][,change],disp,code,hide
+function WIDGET.newSlider(D)--name,x,y,w[,fText][,color][,unit][,smooth][,font][,change],disp,code,hide
 	local _={
 		name=	D.name,
 
@@ -502,6 +507,7 @@ function WIDGET.newSlider(D)--name,x,y,w[,color][,unit][,smooth][,font][,change]
 			D.x+D.w,D.y,
 		},
 
+		fText=	D.fText,
 		color=	D.color and(COLOR[D.color]or D.color)or COLOR.white,
 		unit=	D.unit or 1,
 		smooth=	false,
@@ -654,7 +660,7 @@ function selector:arrowKey(isLeft)
 	self.selText=self.list[s]
 	SFX.play("prerotate")
 end
-function WIDGET.newSelector(D)--name,x,y,w[,color],list,disp,code,hide
+function WIDGET.newSelector(D)--name,x,y,w[,fText][,color],list,disp,code,hide
 	local _={
 		name=	D.name,
 
@@ -670,6 +676,7 @@ function WIDGET.newSelector(D)--name,x,y,w[,color],list,disp,code,hide
 			D.x+D.w,D.y,
 		},
 
+		fText=	D.fText,
 		color=	D.color and(COLOR[D.color]or D.color)or COLOR.white,
 		list=	D.list,
 		disp=	D.disp,
@@ -832,7 +839,7 @@ function WIDGET.setLang(widgetText)
 	for S,L in next,SCN.scenes do
 		if widgetText[S]then
 			for _,W in next,L.widgetList do
-				W.text=widgetText[S][W.name]
+				W.text=W.fText or widgetText[S][W.name]
 			end
 		end
 	end