diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-05-09 13:50:21 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-05-09 13:50:21 +0200 |
| commit | c158e0496297b99ab55323c6c0c806cb729ad2a5 (patch) | |
| tree | 5b1b5693d5774909bf0ec646c5245db6e3869902 /src | |
| parent | 51472970ce519fb39f492238b879d67ad9505f28 (diff) | |
| parent | 87621266ec66df5fc98cce165e5c80b7721983aa (diff) | |
Merge remote-tracking branch 'origin/5.11.0' into 5.11
Change-Id: I76665f0b78e71acf6244c62b60791a792ff35cde
Diffstat (limited to 'src')
| -rw-r--r-- | src/compositor/compositor_api/qwaylandquickitem.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compositor/compositor_api/qwaylandquickitem.cpp b/src/compositor/compositor_api/qwaylandquickitem.cpp index 752e4a423..d4cc94e4b 100644 --- a/src/compositor/compositor_api/qwaylandquickitem.cpp +++ b/src/compositor/compositor_api/qwaylandquickitem.cpp @@ -1013,8 +1013,8 @@ QPointF QWaylandQuickItem::mapToSurface(const QPointF &point) const if (!surface() || surface()->size().isEmpty()) return point / d->scaleFactor(); - qreal xScale = width() / surface()->size().width(); - qreal yScale = height() / surface()->size().height(); + qreal xScale = width() / surface()->size().width() * surface()->bufferScale(); + qreal yScale = height() / surface()->size().height() * surface()->bufferScale(); return QPointF(point.x() / xScale, point.y() / yScale); } |