diff --git a/QtScrcpy/device/ui/videoform.cpp b/QtScrcpy/device/ui/videoform.cpp index bfeba21..a558414 100644 --- a/QtScrcpy/device/ui/videoform.cpp +++ b/QtScrcpy/device/ui/videoform.cpp @@ -100,7 +100,6 @@ void VideoForm::updateStyleSheet(bool vertical) border-width: 150px 142px 85px 142px; } )"); - layout()->setContentsMargins(10, 68, 12, 62); } else { setStyleSheet(R"( #videoForm { @@ -108,8 +107,19 @@ void VideoForm::updateStyleSheet(bool vertical) border-width: 142px 85px 142px 150px; } )"); - layout()->setContentsMargins(68, 12, 62, 10); } + layout()->setContentsMargins(getMargins(vertical)); +} + +QMargins VideoForm::getMargins(bool vertical) +{ + QMargins margins; + if (vertical) { + margins = QMargins(10, 68, 12, 62); + } else { + margins = QMargins(68, 12, 62, 10); + } + return margins; } void VideoForm::updateScreenRatio(const QSize &newSize) @@ -119,8 +129,8 @@ void VideoForm::updateScreenRatio(const QSize &newSize) void VideoForm::updateShowSize(const QSize &newSize) { - if (frameSize != newSize) { - frameSize = newSize; + if (m_frameSize != newSize) { + m_frameSize = newSize; bool vertical = newSize.height() > newSize.width(); QSize showSize = newSize; QDesktopWidget* desktop = QApplication::desktop(); @@ -138,7 +148,7 @@ void VideoForm::updateShowSize(const QSize &newSize) switchFullScreen(); } if (layout()) { - QMargins m = layout()->contentsMargins(); + QMargins m = getMargins(vertical); showSize.setWidth(showSize.width() + m.left() + m.right()); showSize.setHeight(showSize.height() + m.top() + m.bottom()); } diff --git a/QtScrcpy/device/ui/videoform.h b/QtScrcpy/device/ui/videoform.h index f03a045..d817115 100644 --- a/QtScrcpy/device/ui/videoform.h +++ b/QtScrcpy/device/ui/videoform.h @@ -34,6 +34,7 @@ public slots: private: void updateStyleSheet(bool vertical); + QMargins getMargins(bool vertical); void initUI(); void showToolForm(bool show = true); @@ -61,7 +62,7 @@ private: QPointer m_loadingWidget; //inside member - QSize frameSize; + QSize m_frameSize; QPoint m_dragPosition; float m_widthHeightRatio = 0.5f;