diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-10-24 11:02:47 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-11-06 08:37:23 +0000 |
| commit | 39c6f4cea4f2a9eeafcbaa9dc5659c5d8c0d0347 (patch) | |
| tree | 6d7120fd8738e676908cb2baceae05967a9aa982 /src | |
| parent | 34b714122051eae86ac49fd95c7015fb081f79eb (diff) | |
Fix a FIXME
Change-Id: Idd100dd057944d35ba369ce88dcc32a308c1a6ec
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Diffstat (limited to 'src')
| -rw-r--r-- | src/webengine/render_widget_host_view_qt_delegate_quick.cpp | 9 | ||||
| -rw-r--r-- | src/webengine/render_widget_host_view_qt_delegate_quick.h | 2 |
2 files changed, 4 insertions, 7 deletions
diff --git a/src/webengine/render_widget_host_view_qt_delegate_quick.cpp b/src/webengine/render_widget_host_view_qt_delegate_quick.cpp index d23e64774..abdd4a8b3 100644 --- a/src/webengine/render_widget_host_view_qt_delegate_quick.cpp +++ b/src/webengine/render_widget_host_view_qt_delegate_quick.cpp @@ -327,8 +327,7 @@ void RenderWidgetHostViewQtDelegateQuick::geometryChanged(const QRectF &newGeome QQuickItem::geometryChanged(newGeometry, oldGeometry); if (window()) { - // TODO(pvarga): Use QQuickItem::mapToGlobal from Qt 5.7 - const QPoint globalPos = window()->mapToGlobal(position().toPoint()); + const QPointF globalPos = QQuickItem::mapToGlobal(position()); if (globalPos != m_lastGlobalPos) { m_lastGlobalPos = globalPos; m_client->windowBoundsChanged(); @@ -366,10 +365,8 @@ QSGNode *RenderWidgetHostViewQtDelegateQuick::updatePaintNode(QSGNode *oldNode, void RenderWidgetHostViewQtDelegateQuick::onWindowPosChanged() { - if (window()) { - // TODO(pvarga): Use QQuickItem::mapToGlobal from Qt 5.7 - m_lastGlobalPos = window()->mapToGlobal(position().toPoint()); - } + if (window()) + m_lastGlobalPos = QQuickItem::mapToGlobal(position()); m_client->windowBoundsChanged(); } diff --git a/src/webengine/render_widget_host_view_qt_delegate_quick.h b/src/webengine/render_widget_host_view_qt_delegate_quick.h index 6b855c824..2d9dc991b 100644 --- a/src/webengine/render_widget_host_view_qt_delegate_quick.h +++ b/src/webengine/render_widget_host_view_qt_delegate_quick.h @@ -113,7 +113,7 @@ private: QList<QMetaObject::Connection> m_windowConnections; bool m_isPopup; bool m_isPasswordInput; - QPoint m_lastGlobalPos; + QPointF m_lastGlobalPos; QQuickWebEngineView *m_view = nullptr; }; |