Merge pull request #205 from barry-ran/dev

Dev
barry-ran · Jun 6, 2020 · 6fb1d7d · 6fb1d7d
2 parents 3b23648 + 9bcd2ab
commit 6fb1d7d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git 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;

diff --git 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
@@ -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) {

diff --git a/QtScrcpy/dialog.cpp b/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");