From c3a8b3832ffebda290d831a0a828dfe2b6f50a06 Mon Sep 17 00:00:00 2001 From: rankun Date: Wed, 20 May 2020 12:48:28 +0800 Subject: [PATCH 1/4] fix: cant recv mouse move event --- QtScrcpy/device/ui/videoform.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/QtScrcpy/device/ui/videoform.cpp b/QtScrcpy/device/ui/videoform.cpp index 57aaf09c8..e9d77ef22 100644 --- 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())); From 397ae6838d1c1dac36786d21e6d610ef922f99d8 Mon Sep 17 00:00:00 2001 From: rankun Date: Wed, 20 May 2020 13:17:48 +0800 Subject: [PATCH 2/4] feat: change mouse move rate --- keymap/gameforpeace.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keymap/gameforpeace.json b/keymap/gameforpeace.json index 884324e43..97d735a34 100644 --- a/keymap/gameforpeace.json +++ b/keymap/gameforpeace.json @@ -5,7 +5,7 @@ "x": 0.57, "y": 0.26 }, - "speedRatio": 10 + "speedRatio": 8 }, "keyMapNodes": [ { From 53287d0e71bfb82553337c01d7fb536bdad3918d Mon Sep 17 00:00:00 2001 From: rankun Date: Wed, 20 May 2020 13:23:08 +0800 Subject: [PATCH 3/4] fix: QtScrcpy.rc to GB2312 --- QtScrcpy/res/QtScrcpy.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/QtScrcpy/res/QtScrcpy.rc b/QtScrcpy/res/QtScrcpy.rc index f65b4abf6..5adf6615b 100644 --- a/QtScrcpy/res/QtScrcpy.rc +++ b/QtScrcpy/res/QtScrcpy.rc @@ -1,7 +1,7 @@ #include "winres.h" IDI_ICON1 ICON "QtScrcpy.ico" -// 为了FileDescription的中文不乱码,中文系统上本文件需要gbk编码,英文系统上本文件需要utf8编码 + VS_VERSION_INFO VERSIONINFO FILEVERSION VERSION_MAJOR,VERSION_MINOR,VERSION_PATCH PRODUCTVERSION VERSION_MAJOR,VERSION_MINOR,VERSION_PATCH @@ -20,7 +20,7 @@ BEGIN BLOCK "080404b0" BEGIN VALUE "CompanyName", "RanKun" - VALUE "FileDescription", "安卓实时同屏软件" + VALUE "FileDescription", "׿ʵʱͬ" VALUE "FileVersion", VERSION_RC_STR VALUE "LegalCopyright", "Copyright (C) RanKun 2018-2038. All rights reserved." VALUE "ProductName", "QtScrcpy" From 2664cecad97d4c1cc29f50e18ba4b15d16a5a50f Mon Sep 17 00:00:00 2001 From: rankun Date: Wed, 20 May 2020 13:35:01 +0800 Subject: [PATCH 4/4] feat: file desc to english --- QtScrcpy/res/QtScrcpy.rc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/QtScrcpy/res/QtScrcpy.rc b/QtScrcpy/res/QtScrcpy.rc index 5adf6615b..fb7d75f13 100644 --- a/QtScrcpy/res/QtScrcpy.rc +++ b/QtScrcpy/res/QtScrcpy.rc @@ -1,7 +1,8 @@ #include "winres.h" IDI_ICON1 ICON "QtScrcpy.ico" - +// 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"