diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2016-11-22 14:10:56 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-01-11 11:43:28 +0000 |
commit | 23a74e810bb2ec4cb950eaae9760889c1e8a5d54 (patch) | |
tree | d44a3a88102eea33af11d01bb08c1164d4d29798 /src/multimediawidgets | |
parent | 4902bfcbd619e9383ecd2e1b364d4fb1903989db (diff) |
QWindowVideoWidgetBackend: scale coordinates passed to control
Use native coordinates when setting the display rectangle.
Task-number: QTBUG-57145
Change-Id: I4783edcbee021e6020e8ca946f15cca8a1173589
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
Diffstat (limited to 'src/multimediawidgets')
-rw-r--r-- | src/multimediawidgets/qvideowidget.cpp | 23 | ||||
-rw-r--r-- | src/multimediawidgets/qvideowidget_p.h | 2 |
2 files changed, 21 insertions, 4 deletions
diff --git a/src/multimediawidgets/qvideowidget.cpp b/src/multimediawidgets/qvideowidget.cpp index 3d5e5c830..60a968813 100644 --- a/src/multimediawidgets/qvideowidget.cpp +++ b/src/multimediawidgets/qvideowidget.cpp @@ -55,6 +55,9 @@ #include <qboxlayout.h> #include <qnamespace.h> +#include <qwindow.h> +#include <private/qhighdpiscaling_p.h> + using namespace Qt; QT_BEGIN_NAMESPACE @@ -372,11 +375,23 @@ QSize QWindowVideoWidgetBackend::sizeHint() const return m_windowControl->nativeSize(); } +void QWindowVideoWidgetBackend::updateDisplayRect() +{ + QRect rect = m_widget->rect(); + if (QHighDpiScaling::isActive()) { + const qreal factor = QHighDpiScaling::factor(m_widget->windowHandle()); + if (!qFuzzyCompare(factor, qreal(1))) { + rect = QRectF(QPointF(rect.topLeft()) * factor, + QSizeF(rect.size()) * factor).toRect(); + } + } + m_windowControl->setDisplayRect(rect); +} + void QWindowVideoWidgetBackend::showEvent() { m_windowControl->setWinId(m_widget->winId()); - - m_windowControl->setDisplayRect(m_widget->rect()); + updateDisplayRect(); #if defined(Q_WS_WIN) m_widget->setUpdatesEnabled(false); @@ -392,12 +407,12 @@ void QWindowVideoWidgetBackend::hideEvent(QHideEvent *) void QWindowVideoWidgetBackend::moveEvent(QMoveEvent *) { - m_windowControl->setDisplayRect(m_widget->rect()); + updateDisplayRect(); } void QWindowVideoWidgetBackend::resizeEvent(QResizeEvent *) { - m_windowControl->setDisplayRect(m_widget->rect()); + updateDisplayRect(); } void QWindowVideoWidgetBackend::paintEvent(QPaintEvent *event) diff --git a/src/multimediawidgets/qvideowidget_p.h b/src/multimediawidgets/qvideowidget_p.h index 15aaa5a60..039ace24e 100644 --- a/src/multimediawidgets/qvideowidget_p.h +++ b/src/multimediawidgets/qvideowidget_p.h @@ -211,6 +211,8 @@ public: #endif private: + void updateDisplayRect(); + QMediaService *m_service; QVideoWindowControl *m_windowControl; QWidget *m_widget; |