From 09d38370524a66d49e6108305dde9a770c212d8f Mon Sep 17 00:00:00 2001 From: rankun Date: Sat, 18 Jan 2020 15:59:16 +0800 Subject: [PATCH 1/3] fix: game high dpi support --- QtScrcpy/util/mousetap/winmousetap.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/QtScrcpy/util/mousetap/winmousetap.cpp b/QtScrcpy/util/mousetap/winmousetap.cpp index 0a4af53..7303998 100644 --- a/QtScrcpy/util/mousetap/winmousetap.cpp +++ b/QtScrcpy/util/mousetap/winmousetap.cpp @@ -32,6 +32,9 @@ void WinMouseTap::enableMouseEventTap(QWidget *widget, bool enabled) if(enabled) { QRect rc(widget->parentWidget()->mapToGlobal(widget->pos()) , widget->size()); + // high dpi support + rc.setTopLeft(rc.topLeft() * widget->devicePixelRatio()); + rc.setBottomRight(rc.bottomRight() * widget->devicePixelRatio()); RECT mainRect; mainRect.left = (LONG)rc.left(); mainRect.right = (LONG)rc.right(); From 47ce210843fde41c125e33c1bd8dfd0405413e4d Mon Sep 17 00:00:00 2001 From: rankun Date: Sat, 18 Jan 2020 16:05:41 +0800 Subject: [PATCH 2/3] fix: skin overlapping --- 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 18fbff4..45e132e 100644 --- a/QtScrcpy/device/ui/videoform.cpp +++ b/QtScrcpy/device/ui/videoform.cpp @@ -101,15 +101,15 @@ void VideoForm::updateStyleSheet(bool vertical) if (vertical) { setStyleSheet(R"( #videoForm { - border-image: url(:/image/videoform/phone-v.png) 150px 142px 85px 142px; - border-width: 150px 142px 85px 142px; + border-image: url(:/image/videoform/phone-v.png) 150px 65px 85px 65px; + border-width: 150px 65px 85px 65px; } )"); } else { setStyleSheet(R"( #videoForm { - border-image: url(:/image/videoform/phone-h.png) 142px 85px 142px 150px; - border-width: 142px 85px 142px 150px; + border-image: url(:/image/videoform/phone-h.png) 65px 85px 65px 150px; + border-width: 65px 85px 65px 150px; } )"); } From 31efc0de25539e8cc5b372da5f8bf92c9676876e Mon Sep 17 00:00:00 2001 From: rankun Date: Sat, 18 Jan 2020 16:19:51 +0800 Subject: [PATCH 3/3] feat: change video size to max size --- QtScrcpy/dialog.cpp | 13 +++++++------ QtScrcpy/dialog.ui | 4 ++-- QtScrcpy/res/i18n/QtScrcpy_en.qm | Bin 3112 -> 3104 bytes QtScrcpy/res/i18n/QtScrcpy_en.ts | 22 +++++++++++++--------- QtScrcpy/res/i18n/QtScrcpy_zh.qm | Bin 2483 -> 2479 bytes QtScrcpy/res/i18n/QtScrcpy_zh.ts | 22 +++++++++++++--------- 6 files changed, 35 insertions(+), 26 deletions(-) diff --git a/QtScrcpy/dialog.cpp b/QtScrcpy/dialog.cpp index eadd467..5469ab7 100644 --- a/QtScrcpy/dialog.cpp +++ b/QtScrcpy/dialog.cpp @@ -80,11 +80,12 @@ void Dialog::initUI() ui->bitRateBox->addItem("10000000"); ui->bitRateBox->setCurrentIndex(2); - ui->videoSizeBox->addItem("480"); - ui->videoSizeBox->addItem("720"); - ui->videoSizeBox->addItem("1080"); - ui->videoSizeBox->addItem("native"); - ui->videoSizeBox->setCurrentIndex(1); + ui->maxSizeBox->addItem("600"); + ui->maxSizeBox->addItem("800"); + ui->maxSizeBox->addItem("1000"); + ui->maxSizeBox->addItem("1200"); + ui->maxSizeBox->addItem("native"); + ui->maxSizeBox->setCurrentIndex(2); ui->formatBox->addItem("mp4"); ui->formatBox->addItem("mkv"); @@ -147,7 +148,7 @@ void Dialog::on_startServerBtn_clicked() quint32 bitRate = ui->bitRateBox->currentText().trimmed().toUInt(); // this is ok that "native" toUshort is 0 - quint16 videoSize = ui->videoSizeBox->currentText().trimmed().toUShort(); + quint16 videoSize = ui->maxSizeBox->currentText().trimmed().toUShort(); Device::DeviceParams params; params.serial = ui->serialBox->currentText().trimmed(); params.maxSize = videoSize; diff --git a/QtScrcpy/dialog.ui b/QtScrcpy/dialog.ui index 0f33bc2..1b77309 100644 --- a/QtScrcpy/dialog.ui +++ b/QtScrcpy/dialog.ui @@ -299,7 +299,7 @@ - video size: + max size: @@ -318,7 +318,7 @@ - + diff --git a/QtScrcpy/res/i18n/QtScrcpy_en.qm b/QtScrcpy/res/i18n/QtScrcpy_en.qm index b92b58c2242ba0e70f28f190018ccfbbb0c46f03..89b24d126e77f9ddfab71e4c62a84cdf1479a3af 100644 GIT binary patch delta 347 zcmZ1>u|Q&ibQb$R2DWde3=EvA4D2?cK-!PNOmqH@p+{N4`!79Ghmqmb1^We{1AqCX% zn19#hSwMOY|J}~5K(B~o0ww2fu3|J`krQCZWk_VGU{GKvX2@iyVo2oxx|D$ph&gi; UD<+@k5ZkYod5s; delta 338 zcmZ1=u|i^kv=;{(1KT%K1_n-D26mfJARWeFCc21$fwhPsOS_4If$1_sdF~;gcs)ap zrZWQr<0nRTE-wZKc5Oz>N9Ta@e<3tS*2GwG!Hvw^SLJ|;Z!sU{TEM`-B{8v8oiTml zTKW3b>}z^=FfefFvp>^%1T_99`*+VcApbo_oY83p28J6P8{(caFtEMnWd5}QXlx3n zgHbAwZ_1f?fd#1El1pxt1Oo%hU#?@WQ-R{y+>!Sc7#Nssxa&n;0>yQ>4`|;6nzx$! zgH#Dnel5@IHAjK+yZEFnTNoJB**Ed6zAOTCQUHJE3Mrt5_58ao&jQjJ{C7LI0{tbD z36xyExr)(%W%E7O|4ce!3}pr| MrCM!1%Mr{B0K?T*lK=n! diff --git a/QtScrcpy/res/i18n/QtScrcpy_en.ts b/QtScrcpy/res/i18n/QtScrcpy_en.ts index a5820d1..1552df7 100644 --- a/QtScrcpy/res/i18n/QtScrcpy_en.ts +++ b/QtScrcpy/res/i18n/QtScrcpy_en.ts @@ -16,22 +16,22 @@ file transfer failed - + install apk install apk - + file transfer file transfer - + wait current %1 to complete wait current %1 to complete - + %1 complete, save in %2 %1 complete, save in %2 @@ -41,7 +41,7 @@ %1 complete\n save in %2 - + %1 failed %1 failed @@ -75,7 +75,7 @@ - + select path select path @@ -128,6 +128,11 @@ use reverse use reverse + + + max size: + max size + close screen @@ -173,9 +178,8 @@ bit rate: - video size: - video size: + video size: @@ -274,7 +278,7 @@ file transfer failed - + file does not exist file does not exist diff --git a/QtScrcpy/res/i18n/QtScrcpy_zh.qm b/QtScrcpy/res/i18n/QtScrcpy_zh.qm index 5b1098de0707245cd5c0a750183f91b58c48418a..0fa54e36c971cce6c1e0204f0d42c051376d133e 100644 GIT binary patch delta 344 zcmdliyk2;MOr{D0+c#4N26lD^cAHQjt;b*{x`=^+C50hNyNQ8;Nt2;G_YhD#n4w40 znSp_^gwgWRIiR>Ngl4N?w3l7Lz`)GL7;tntP+p30SIZ=z{>jYTSLJ~E7BC;?0?M^#wz*;2T+264Tw2&6Dt&oGpkaqHm_hw PWtv>T&brx&y^sk21JYNn delta 323 zcmZ24yjggHjHdE_eR&~bx6W7Yu z*Rrqa-NC@X=F9#}>k-iSx$NIPP~YeUSI*z>|AoIBp4W&Z*m=ToeJcC=8n9t0JOe_yI$laP~3|9fc8zGd26{pNR

2X>nFa|mqmb1`p2KSLJFv1KL4)Evw(CK|J}~5KnGmOWMJU1 x++4+I$GrIoODK~RSLd-A6JxBRfBcu?0LnA40Wo)3W=d-Q文件传输失败 - + install apk 安装apk - + file transfer 文件传输 - + wait current %1 to complete 等待当前%1完成 - + %1 complete, save in %2 %1完成,保存在%2 @@ -41,7 +41,7 @@ %1完成\n 保存在 %2 - + %1 failed %1 失败 @@ -75,7 +75,7 @@ - + select path 选择路径 @@ -128,6 +128,11 @@ use reverse 使用reverse + + + max size: + 最大尺寸 + close screen @@ -173,9 +178,8 @@ 比特率： - video size: - 视频尺寸： + 视频尺寸： @@ -274,7 +278,7 @@ 文件传输失败 - + file does not exist 文件不存在