From 3bd6da6276f5e43f73782f7a22fce36600e53e95 Mon Sep 17 00:00:00 2001 From: MrZ626 <1046101471@qq.com> Date: Sun, 1 Aug 2021 00:44:09 +0800 Subject: [PATCH] =?UTF-8?q?=E9=BC=A0=E6=A0=87=E6=9D=BE=E5=BC=80=E6=97=B6?= =?UTF-8?q?=E5=A6=82=E6=9E=9C=E6=9C=89=E9=80=89=E4=B8=AD=E7=9A=84=E6=8E=A7?= =?UTF-8?q?=E4=BB=B6=E5=B0=B1=E4=B8=8D=E8=A7=A6=E5=8F=91=E5=9C=BA=E6=99=AF?= =?UTF-8?q?=E7=9A=84=E9=BC=A0=E6=A0=87=E6=9D=BE=E5=BC=80/=E7=82=B9?= =?UTF-8?q?=E5=87=BB=E4=BA=8B=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Zframework/init.lua | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Zframework/init.lua b/Zframework/init.lua index 793afd81..fb83f771 100644 --- a/Zframework/init.lua +++ b/Zframework/init.lua @@ -149,10 +149,13 @@ end function love.mousereleased(x,y,k,touch) if touch or SCN.swapping then return end mx,my=ITP(xOy,x,y) - WIDGET.release(mx,my) - if SCN.mouseUp then SCN.mouseUp(mx,my,k)end - if lastX and SCN.mouseClick and(mx-lastX)^2+(my-lastY)^2<62 then - SCN.mouseClick(mx,my,k) + if WIDGET.sel then + WIDGET.release(mx,my) + else + if SCN.mouseUp then SCN.mouseUp(mx,my,k)end + if lastX and SCN.mouseClick and(mx-lastX)^2+(my-lastY)^2<62 then + SCN.mouseClick(mx,my,k) + end end end function love.wheelmoved(x,y)