From c528aec253567bacd2c3706df7938b43af8a86d6 Mon Sep 17 00:00:00 2001 From: Liangent Date: Fri, 5 Jun 2020 12:22:08 +0000 Subject: [PATCH 1/7] Auto-run on Key_Equal for the sample keymap --- keymap/gameforpeace.json | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/keymap/gameforpeace.json b/keymap/gameforpeace.json index 3b46c4a..5895c53 100644 --- a/keymap/gameforpeace.json +++ b/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", @@ -253,4 +263,4 @@ "switchMap": false } ] -} \ No newline at end of file +} From 7b44c80dd6088bbfe3014cdb691c12aeca1633dc Mon Sep 17 00:00:00 2001 From: Liangent Date: Sat, 6 Jun 2020 04:52:11 +0000 Subject: [PATCH 2/7] TPP/FPP switch on Key_V for the sample keymap --- keymap/gameforpeace.json | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/keymap/gameforpeace.json b/keymap/gameforpeace.json index 3b46c4a..d9b10a4 100644 --- a/keymap/gameforpeace.json +++ b/keymap/gameforpeace.json @@ -82,6 +82,16 @@ }, "switchMap": true }, + { + "comment": "视角", + "type": "KMT_CLICK", + "key": "Key_V", + "pos": { + "x": 0.23, + "y": 0.95 + }, + "switchMap": false + }, { "comment": "趴", "type": "KMT_CLICK", @@ -253,4 +263,4 @@ "switchMap": false } ] -} \ No newline at end of file +} From d0890bf46b79be1a2654e60993150fc5c94601c5 Mon Sep 17 00:00:00 2001 From: rankun Date: Sat, 6 Jun 2020 18:41:14 +0800 Subject: [PATCH 3/7] fix: build error on ubuntu --- QtScrcpy/device/ui/videoform.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/QtScrcpy/device/ui/videoform.cpp b/QtScrcpy/device/ui/videoform.cpp index a8ff5b9..aee311b 100644 --- a/QtScrcpy/device/ui/videoform.cpp +++ b/QtScrcpy/device/ui/videoform.cpp @@ -501,7 +501,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) { From 73f01fa2c7cd2c33b7aeca4b0a5339c283c8ea87 Mon Sep 17 00:00:00 2001 From: rankun Date: Sat, 6 Jun 2020 19:06:19 +0800 Subject: [PATCH 4/7] fix: stop mouse move touch on stop keymap Close #185 --- QtScrcpy/device/controller/inputconvert/inputconvertgame.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/QtScrcpy/device/controller/inputconvert/inputconvertgame.cpp b/QtScrcpy/device/controller/inputconvert/inputconvertgame.cpp index 8ae3846..d050073 100644 --- a/QtScrcpy/device/controller/inputconvert/inputconvertgame.cpp +++ b/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; From 9a886447087417e3b2abce23300429cf86b0356e Mon Sep 17 00:00:00 2001 From: rankun Date: Sat, 6 Jun 2020 19:17:07 +0800 Subject: [PATCH 5/7] fix: add bitrate to 200m Close #199 --- QtScrcpy/dialog.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/QtScrcpy/dialog.cpp b/QtScrcpy/dialog.cpp index 38fa4d8..a8ac0a7 100644 --- a/QtScrcpy/dialog.cpp +++ b/QtScrcpy/dialog.cpp @@ -91,6 +91,10 @@ void Dialog::initUI() 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"); From 723887c9ede4282871a362180f707eea0cd33418 Mon Sep 17 00:00:00 2001 From: rankun Date: Sat, 6 Jun 2020 20:35:32 +0800 Subject: [PATCH 6/7] fix: minimize on mac --- QtScrcpy/dialog.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/QtScrcpy/dialog.cpp b/QtScrcpy/dialog.cpp index a8ac0a7..3a716f5 100644 --- a/QtScrcpy/dialog.cpp +++ b/QtScrcpy/dialog.cpp @@ -85,7 +85,7 @@ 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"); From 9bcd2ab1b5fbf293dbde09f088d755d3985ef35f Mon Sep 17 00:00:00 2001 From: rankun Date: Sat, 6 Jun 2020 20:49:33 +0800 Subject: [PATCH 7/7] fix: mouse move grab rect too small on mac --- QtScrcpy/device/ui/videoform.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/QtScrcpy/device/ui/videoform.cpp b/QtScrcpy/device/ui/videoform.cpp index aee311b..d555ac2 100644 --- a/QtScrcpy/device/ui/videoform.cpp +++ b/QtScrcpy/device/ui/videoform.cpp @@ -100,10 +100,10 @@ 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); #else #endif