From 39e6504bb5c28ec0ff265eda0096ceb13c80124f Mon Sep 17 00:00:00 2001
From: MrZ626 <1046101471@qq.com>
Date: Thu, 22 Apr 2021 11:22:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Zframework/aDraw.lua  | 10 ++++++++++
 Zframework/init.lua   |  8 ++++----
 Zframework/mDraw.lua  | 10 ----------
 Zframework/widget.lua |  8 ++++----
 4 files changed, 18 insertions(+), 18 deletions(-)
 create mode 100644 Zframework/aDraw.lua
 delete mode 100644 Zframework/mDraw.lua

diff --git a/Zframework/aDraw.lua b/Zframework/aDraw.lua
new file mode 100644
index 00000000..4dd9bfba
--- /dev/null
+++ b/Zframework/aDraw.lua
@@ -0,0 +1,10 @@
+local printf=love.graphics.printf
+local draw=love.graphics.draw
+local aDraw={}
+function aDraw.str(obj,x,y)printf(obj,x-626,y,1252,"center")end
+function aDraw.simpX(obj,x,y)draw(obj,x-obj:getWidth()*.5,y)end
+function aDraw.simpY(obj,x,y)draw(obj,x,y-obj:getHeight()*.5)end
+function aDraw.X(obj,x,y,a,k)draw(obj,x,y,a,k,nil,obj:getWidth()*.5,0)end
+function aDraw.Y(obj,x,y,a,k)draw(obj,x,y,a,k,nil,0,obj:getHeight()*.5)end
+function aDraw.draw(obj,x,y,a,k)draw(obj,x,y,a,k,nil,obj:getWidth()*.5,obj:getHeight()*.5)end
+return aDraw
\ No newline at end of file
diff --git a/Zframework/init.lua b/Zframework/init.lua
index 89491116..221a1aa9 100644
--- a/Zframework/init.lua
+++ b/Zframework/init.lua
@@ -8,10 +8,10 @@ LOADLIB=require"Zframework.loadLib"
 WHEELMOV=require"Zframework.wheelScroll"
 
 require"Zframework.setFont"
-MDRAW=require"Zframework.mDraw"
-	mStr=MDRAW.str
-	mText=MDRAW.simpX
-	mDraw=MDRAW.draw
+ADRAW=require"Zframework.aDraw"
+	mStr=ADRAW.str
+	mText=ADRAW.simpX
+	mDraw=ADRAW.draw
 
 JSON=require"Zframework.json"
 
diff --git a/Zframework/mDraw.lua b/Zframework/mDraw.lua
deleted file mode 100644
index ae686d22..00000000
--- a/Zframework/mDraw.lua
+++ /dev/null
@@ -1,10 +0,0 @@
-local printf=love.graphics.printf
-local draw=love.graphics.draw
-local mDraw={}
-function mDraw.str(obj,x,y)printf(obj,x-626,y,1252,"center")end
-function mDraw.simpX(obj,x,y)draw(obj,x-obj:getWidth()*.5,y)end
-function mDraw.simpY(obj,x,y)draw(obj,x,y-obj:getHeight()*.5)end
-function mDraw.X(obj,x,y,a,k)draw(obj,x,y,a,k,nil,obj:getWidth()*.5,0)end
-function mDraw.Y(obj,x,y,a,k)draw(obj,x,y,a,k,nil,0,obj:getHeight()*.5)end
-function mDraw.draw(obj,x,y,a,k)draw(obj,x,y,a,k,nil,obj:getWidth()*.5,obj:getHeight()*.5)end
-return mDraw
\ No newline at end of file
diff --git a/Zframework/widget.lua b/Zframework/widget.lua
index 509bad39..7cfadc70 100644
--- a/Zframework/widget.lua
+++ b/Zframework/widget.lua
@@ -1,5 +1,5 @@
-local gc=love.graphics
 local kb=love.keyboard
+local gc=love.graphics
 
 local int,abs=math.floor,math.abs
 local max,min=math.max,math.min
@@ -7,7 +7,7 @@ local sub,format=string.sub,string.format
 local ins=table.insert
 local COLOR=COLOR
 local setFont,mStr=setFont,mStr
-local mDraw_Y=MDRAW.simpY
+local mDraw_X,mDraw_Y=ADRAW.simpX,ADRAW.simpY
 
 local allowNoText={
 	image=true,
@@ -42,7 +42,7 @@ function text:draw()
 		gc.setColor(c[1],c[2],c[3],self.alpha)
 		local obj=self.obj
 		if self.align=="M"then
-			gc.draw(obj,self.x-obj:getWidth()*.5,self.y)
+			mDraw_X(obj,self.x,self.y)
 		elseif self.align=="L"then
 			gc.draw(obj,self.x,self.y)
 		elseif self.align=="R"then
@@ -637,7 +637,7 @@ function selector:draw()
 
 	--Drawable
 	gc.setColor(self.color)
-	MDRAW.simpX(self.obj,x+w*.5,y+17-21)
+	ADRAW.simpX(self.obj,x+w*.5,y+17-21)
 	gc.setColor(1,1,1)
 	setFont(30)
 	mStr(self.selText,x+w*.5,y+43-21)