From 7016d92bf809f9b6d130357875b39c0b88c75f95 Mon Sep 17 00:00:00 2001 From: Jabin ma Date: Tue, 25 Jun 2019 22:50:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B1=8F=E5=B9=95=E6=AF=94?= =?UTF-8?q?=E4=BE=8B=E5=A4=B1=E7=9C=9F=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- QtScrcpy/device/device.cpp | 1 + QtScrcpy/device/ui/videoform.cpp | 6 +++++- QtScrcpy/device/ui/videoform.h | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/QtScrcpy/device/device.cpp b/QtScrcpy/device/device.cpp index a4f0ce0..3a95f3a 100644 --- a/QtScrcpy/device/device.cpp +++ b/QtScrcpy/device/device.cpp @@ -130,6 +130,7 @@ void Device::initSignals() // update ui if (m_videoForm) { m_videoForm->setWindowTitle(deviceName); + m_videoForm->updateScreenRatio(size); m_videoForm->updateShowSize(size); } diff --git a/QtScrcpy/device/ui/videoform.cpp b/QtScrcpy/device/ui/videoform.cpp index 57a8465..4eb75bf 100644 --- a/QtScrcpy/device/ui/videoform.cpp +++ b/QtScrcpy/device/ui/videoform.cpp @@ -112,11 +112,15 @@ void VideoForm::updateStyleSheet(bool vertical) } } +void VideoForm::updateScreenRatio(const QSize &newSize) +{ + m_widthHeightRatio = 1.0f * qMin(newSize.width(),newSize.height()) / qMax(newSize.width(),newSize.height()); +} + void VideoForm::updateShowSize(const QSize &newSize) { if (frameSize != newSize) { frameSize = newSize; - bool vertical = newSize.height() > newSize.width(); QSize showSize = newSize; QDesktopWidget* desktop = QApplication::desktop(); diff --git a/QtScrcpy/device/ui/videoform.h b/QtScrcpy/device/ui/videoform.h index 31327d2..f03a045 100644 --- a/QtScrcpy/device/ui/videoform.h +++ b/QtScrcpy/device/ui/videoform.h @@ -21,6 +21,7 @@ public: void switchFullScreen(); void staysOnTop(bool top = true); + void updateScreenRatio(const QSize &newSize); void updateShowSize(const QSize &newSize); void updateRender(const AVFrame *frame); void setController(Controller *controller);