From e2a5109b1689105ef1a6ff7d2ba5815b839806ce Mon Sep 17 00:00:00 2001
From: Barry <870709864@qq.com>
Date: Wed, 14 Nov 2018 20:54:32 +0800
Subject: [PATCH] =?UTF-8?q?=E9=99=8D=E4=BD=8E=E9=BC=A0=E6=A0=87=E7=81=B5?=
 =?UTF-8?q?=E6=95=8F=E5=BA=A6=EF=BC=88=E5=BE=85=E4=BC=98=E5=8C=96=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 QtScrcpy/inputcontrol/inputconvertgame.cpp | 19 ++++++++++++++-----
 QtScrcpy/inputcontrol/inputconvertgame.h   |  2 +-
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/QtScrcpy/inputcontrol/inputconvertgame.cpp b/QtScrcpy/inputcontrol/inputconvertgame.cpp
index 598a8a5..b8af4f7 100644
--- a/QtScrcpy/inputcontrol/inputconvertgame.cpp
+++ b/QtScrcpy/inputcontrol/inputconvertgame.cpp
@@ -267,12 +267,16 @@ bool InputConvertGame::processKeyClick(const QKeyEvent *from)
         clickPos = QPointF(0.96f, 0.7f);
         break;
     case Qt::Key_M: // 地图
-        switchGameMap();
+        if (QEvent::KeyRelease == from->type()) {
+            switchGameMap();
+        }
         clickPos = QPointF(0.98f, 0.03f);
         break;
     case Qt::Key_Tab: // 背包
-        clickPos = QPointF(0.06f, 0.9f);
-        switchGameMap();
+        if (QEvent::KeyRelease == from->type()) {
+            switchGameMap();
+        }
+        clickPos = QPointF(0.06f, 0.9f);        
         break;
     case Qt::Key_Z: // 趴
         clickPos = QPointF(0.95f, 0.9f);
@@ -382,13 +386,17 @@ bool InputConvertGame::processMouseMove(const QMouseEvent *from)
     // convert pos
     pos.setX(pos.x() / m_showSize.width());
     pos.setY(pos.y() / m_showSize.height());
-    sendTouchMoveEvent(getTouchID(Qt::ExtraButton24), pos);
-    m_mouseMoveLastPos = pos;
+
     if (pos.x() < 0.1 || pos.x() > 0.9 || pos.y() < 0.1 || pos.y() > 0.9) {
         mouseMoveStopTouch();
         mouseMoveStartTouch(from);
     }
 
+    if (!m_mouseMoveLastPos.isNull()) {
+        pos = (m_mouseMoveLastPos + pos)/4;
+    }
+    sendTouchMoveEvent(getTouchID(Qt::ExtraButton24), pos);
+    m_mouseMoveLastPos = pos;    
     return true;
 }
 
@@ -430,6 +438,7 @@ void InputConvertGame::mouseMoveStopTouch()
 {
     if (m_mouseMovePress) {
         sendTouchUpEvent(getTouchID(Qt::ExtraButton24), m_mouseMoveLastPos);
+        m_mouseMoveLastPos = QPointF(0.0f, 0.0f);
         detachTouchID(Qt::ExtraButton24);
         m_mouseMovePress = false;
     }
diff --git a/QtScrcpy/inputcontrol/inputconvertgame.h b/QtScrcpy/inputcontrol/inputconvertgame.h
index b2e6af3..15607e4 100644
--- a/QtScrcpy/inputcontrol/inputconvertgame.h
+++ b/QtScrcpy/inputcontrol/inputconvertgame.h
@@ -78,7 +78,7 @@ private:
 
     // mouse move
     QPointF m_mouseMoveStartPos = {0.57f, 0.26f};
-    QPointF m_mouseMoveLastPos;
+    QPointF m_mouseMoveLastPos = {0.0f, 0.0f};
     bool m_mouseMovePress = false;
     int m_mouseMoveTimer = 0;
 };