From fecb292e9ba49826c6f1ed36d42959977b898498 Mon Sep 17 00:00:00 2001
From: MrZ626 <1046101471@qq.com>
Date: Thu, 27 May 2021 02:20:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=AB=98dpi=E6=8B=96?=
 =?UTF-8?q?=E5=8A=A8=E5=B1=8F=E5=B9=95=E6=97=B6=E6=93=8D=E4=BD=9C=E8=B7=9D?=
 =?UTF-8?q?=E7=A6=BB=E6=AF=94=E4=BE=8B=E4=B8=8D=E6=AD=A3=E7=A1=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Zframework/init.lua   | 4 ++--
 Zframework/widget.lua | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Zframework/init.lua b/Zframework/init.lua
index 474f1569..c8cfb977 100644
--- a/Zframework/init.lua
+++ b/Zframework/init.lua
@@ -142,7 +142,7 @@ function love.mousemoved(x,y,dx,dy,touch)
 	dx,dy=dx/SCR.k,dy/SCR.k
 	if SCN.mouseMove then SCN.mouseMove(mx,my,dx,dy)end
 	if ms.isDown(1)then
-		WIDGET.drag(mx,my,dx,dy)
+		WIDGET.drag(mx,my,dx*SCR.dpi,dy*SCR.dpi)
 	else
 		WIDGET.cursorMove(mx,my)
 	end
@@ -178,7 +178,7 @@ function love.touchmoved(_,x,y,dx,dy)
 	if SCN.swapping then return end
 	x,y=xOy:inverseTransformPoint(x,y)
 	if SCN.touchMove then SCN.touchMove(x,y,dx/SCR.k,dy/SCR.k)end
-	WIDGET.drag(x,y,dx,dy)
+	WIDGET.drag(x,y,dx*SCR.dpi,dy*SCR.dpi)
 	if touching then
 		WIDGET.cursorMove(x,y)
 		if not WIDGET.sel then touching=false end
diff --git a/Zframework/widget.lua b/Zframework/widget.lua
index cd28f71c..26ed726d 100644
--- a/Zframework/widget.lua
+++ b/Zframework/widget.lua
@@ -1124,7 +1124,7 @@ function WIDGET.drag(x,y,dx,dy)
 	if WIDGET.sel then
 		local W=WIDGET.sel
 		if W.type=='slider'or W.type=='textBox'then
-			W:drag(x,y+WIDGET.scrollPos,dx*SCR.dpi,dy*SCR.dpi)
+			W:drag(x,y+WIDGET.scrollPos,dx,dy)
 		elseif not W:isAbove(x,y)then
 			WIDGET.unFocus(true)
 		end