Merge pull request #176 from barry-ran/dev

Dev
barry-ran · May 20, 2020 · ecc0114 · ecc0114
2 parents 6b64298 + 2664cec
commit ecc0114
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/QtScrcpy/device/ui/videoform.cpp b/QtScrcpy/device/ui/videoform.cpp
@@ -92,6 +92,10 @@ 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);
+    rc.setHeight(rc.height() - 20);
 #elif defined(Q_OS_OSX)
     rc = m_videoWidget->geometry();
     rc.setTopLeft(ui->keepRadioWidget->mapToGlobal(rc.topLeft()));

diff --git a/QtScrcpy/res/QtScrcpy.rc b/QtScrcpy/res/QtScrcpy.rc
@@ -1,7 +1,8 @@
 #include "winres.h"
 
 IDI_ICON1       ICON      "QtScrcpy.ico"
-// 为了FileDescription的中文不乱码，中文系统上本文件需要gbk编码，英文系统上本文件需要utf8编码
+// GB2312编码的话，在中文系统上打包FileDescription可以显示中文
+// 在github action（英文系统）打包后FileDescription是乱码，utf8编码也不行。。
 VS_VERSION_INFO VERSIONINFO
  FILEVERSION VERSION_MAJOR,VERSION_MINOR,VERSION_PATCH
  PRODUCTVERSION VERSION_MAJOR,VERSION_MINOR,VERSION_PATCH
@@ -20,7 +21,7 @@ BEGIN
         BLOCK "080404b0"
         BEGIN
             VALUE "CompanyName", "RanKun"
-            VALUE "FileDescription", "安卓实时同屏软件"
+            VALUE "FileDescription", "Android real-time display control software"
             VALUE "FileVersion", VERSION_RC_STR
             VALUE "LegalCopyright", "Copyright (C) RanKun 2018-2038. All rights reserved."
             VALUE "ProductName", "QtScrcpy"

diff --git a/keymap/gameforpeace.json b/keymap/gameforpeace.json
@@ -5,7 +5,7 @@
 			"x": 0.57,
 			"y": 0.26
 		},
-		"speedRatio": 10
+		"speedRatio": 8
 	},
 	"keyMapNodes": [
 		{