From 101c8a299497651ec677c0a721a8022e6c4e778b Mon Sep 17 00:00:00 2001
From: MrZ626 <1046101471@qq.com>
Date: Mon, 14 Jun 2021 20:39:45 +0800
Subject: [PATCH] =?UTF-8?q?MES=E6=A8=A1=E5=9D=97=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=A4=9A=E8=A1=8C=E4=BF=A1=E6=81=AF=E4=B8=8E?=
 =?UTF-8?q?=E5=B0=8F=E6=AF=94=E4=BE=8B=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Zframework/message.lua | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/Zframework/message.lua b/Zframework/message.lua
index f014c802..25b087d7 100644
--- a/Zframework/message.lua
+++ b/Zframework/message.lua
@@ -62,13 +62,13 @@ local MES={}
 function MES.new(icon,str,time)
 	if type(icon)=='string'then icon=mesIcon[icon]end
 	local t=gc.newText(getFont(30),str)
-	local w=math.max(t:getWidth()+(icon and 45 or 5),200)
-	local L={w+20,48,
-		{'setCL',.5,.5,.5,.7},
-		{'fRect',0,0,w+20,48},
+	local w=math.max(t:getWidth()+(icon and 45 or 5),200)+20
+	local h=math.max(t:getHeight(),46)
+	local L={w,h,
+		{'clear',.5,.5,.5,.7},
 		{'setCL',.7,.7,.7},
 		{'setLW',2},
-		{'dRect',1,1,w+18,46},
+		{'dRect',1,1,w-2,h-2},
 		{'setCL',1,1,1},
 	}
 	if icon then
@@ -81,6 +81,8 @@ function MES.new(icon,str,time)
 		endTime=.5,
 		time=time or 3,
 		canvas=DOGC(L),
+		width=w,height=h,
+		scale=h>400 and 1/math.min(h/400,2.6)or 1
 	})
 end
 
@@ -106,8 +108,8 @@ function MES.draw()
 		for i=1,#mesList do
 			local m=mesList[i]
 			gc_setColor(1,1,1,2*(m.endTime-m.startTime))
-			gc_draw(m.canvas,40-80*(m.endTime+m.startTime))
-			gc_translate(0,52)
+			gc_draw(m.canvas,40-80*(m.endTime+m.startTime),0,nil,m.scale)
+			gc_translate(0,(m.height+4)*m.scale)
 		end
 	end
 	gc_pop()