Merge branch 'dev' into xmousetap-pr

QtScrcpy/device/controller/inputconvert/inputconvertgame.cpp

@@ -470,6 +470,8 @@ bool InputConvertGame::switchGameMap()
         QGuiApplication::setOverrideCursor(QCursor(Qt::CrossCursor));
 #endif
     } else {
+        stopMouseMoveTimer();
+        mouseMoveStopTouch();
         QGuiApplication::restoreOverrideCursor();
     }
     return m_gameMap;

QtScrcpy/device/ui/videoform.cpp

@@ -92,6 +92,7 @@ QRect VideoForm::getGrabCursorRect()
     // high dpi support
     rc.setTopLeft(rc.topLeft() * m_videoWidget->devicePixelRatio());
     rc.setBottomRight(rc.bottomRight() * m_videoWidget->devicePixelRatio());
+  
     rc.setX(rc.x() + 10);
     rc.setY(rc.y() + 10);
     rc.setWidth(rc.width() - 20);
@@ -100,15 +101,21 @@ QRect VideoForm::getGrabCursorRect()
     rc = m_videoWidget->geometry();
     rc.setTopLeft(ui->keepRadioWidget->mapToGlobal(rc.topLeft()));
     rc.setBottomRight(ui->keepRadioWidget->mapToGlobal(rc.bottomRight()));
-    rc.setX(rc.x() + 100);
-    rc.setY(rc.y() + 30);
-    rc.setWidth(rc.width() - 180);
-    rc.setHeight(rc.height() - 60);
+
+    rc.setX(rc.x() + 10);
+    rc.setY(rc.y() + 10);
+    rc.setWidth(rc.width() - 20);
+    rc.setHeight(rc.height() - 20);
 #elif defined(Q_OS_LINUX)
     rc = QRect(ui->keepRadioWidget->mapToGlobal(m_videoWidget->pos()), m_videoWidget->size());
     // high dpi support -- taken from the WIN32 section and untested
     rc.setTopLeft(rc.topLeft() * m_videoWidget->devicePixelRatio());
     rc.setBottomRight(rc.bottomRight() * m_videoWidget->devicePixelRatio());
+    
+    rc.setX(rc.x() + 10);
+    rc.setY(rc.y() + 10);
+    rc.setWidth(rc.width() - 20);
+    rc.setHeight(rc.height() - 20);
 #endif
     return rc;
 }
@@ -504,7 +511,7 @@ void VideoForm::mousePressEvent(QMouseEvent *event)
             qreal x = event->localPos().x() / m_videoWidget->size().width();
             qreal y = event->localPos().y() / m_videoWidget->size().height();
             QString posTip = QString(R"("pos": {"x": %1, "y": %2})").arg(x).arg(y);
-            qInfo(posTip.toStdString().c_str());
+            qInfo() << posTip.toStdString().c_str();
         }
     } else {
         if (event->button() == Qt::LeftButton) {

QtScrcpy/dialog.cpp

@@ -85,12 +85,16 @@ Dialog::~Dialog()
 void Dialog::initUI()
 {
     setAttribute(Qt::WA_DeleteOnClose);
-    setWindowFlags(windowFlags() | Qt::WindowMinimizeButtonHint);
+    setWindowFlags(windowFlags() | Qt::WindowMinimizeButtonHint | Qt::WindowCloseButtonHint | Qt::CustomizeWindowHint);
 
     ui->bitRateBox->addItem("2000000");
     ui->bitRateBox->addItem("6000000");
     ui->bitRateBox->addItem("8000000");
     ui->bitRateBox->addItem("10000000");
+    ui->bitRateBox->addItem("20000000");
+    ui->bitRateBox->addItem("50000000");
+    ui->bitRateBox->addItem("100000000");
+    ui->bitRateBox->addItem("200000000");
     ui->bitRateBox->setCurrentIndex(Config::getInstance().getBitRateIndex());
 
     ui->maxSizeBox->addItem("640");

keymap/gameforpeace.json

@@ -52,6 +52,16 @@
 				"y": 0.35
 			}
 		},
+		{
+			"comment": "自动跑",
+			"type": "KMT_CLICK",
+			"key": "Key_Equal",
+			"pos": {
+				"x": 0.84,
+				"y": 0.26
+			},
+			"switchMap": false
+		},
 		{
 			"comment": "跳",
 			"type": "KMT_CLICK",
@@ -82,6 +92,16 @@
 			},
 			"switchMap": true
 		},
+		{
+			"comment": "视角",
+			"type": "KMT_CLICK",
+			"key": "Key_V",
+			"pos": {
+				"x": 0.23,
+				"y": 0.95
+			},
+			"switchMap": false
+		},
 		{
 			"comment": "趴",
 			"type": "KMT_CLICK",