diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-08-18 14:11:06 +0200 |
|---|---|---|
| committer | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-08-20 17:13:51 +0200 |
| commit | 7717f941a349140497d5e689530a2bf31e8397da (patch) | |
| tree | 10a59c8fdc08bbaabc4c3b21500b56c259021f1a /src/webengine/api | |
| parent | 7ea45766f6c49de9a81a387013fb1b98ab82766d (diff) | |
Propagate the page's screen coordinates when the top-level window moved
This fixes a regression after the 37 upgrade where the select popups
would have the wrong position. Adjust to the new behavior and also
avoid doing a mapToGlobal of the position received in InitAsPopup.
RWHV::SetBounds has been giving us screen coordinates since the
Chromium 33 update, but popup locations somehow managed to work
properly through some side-effect sorcery.
This also fixes the value of window.screen[XY] in JavaScript which
wasn't updated when the window was moved.
Change-Id: I544499bafedccfb7d389b4abc48f1386c398473f
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
Diffstat (limited to 'src/webengine/api')
| -rw-r--r-- | src/webengine/api/qquickwebengineview.cpp | 6 | ||||
| -rw-r--r-- | src/webengine/api/qquickwebengineview_p_p.h | 1 |
2 files changed, 0 insertions, 7 deletions
diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp index e9c5232ab..9e0f5ad50 100644 --- a/src/webengine/api/qquickwebengineview.cpp +++ b/src/webengine/api/qquickwebengineview.cpp @@ -265,12 +265,6 @@ QRectF QQuickWebEngineViewPrivate::viewportRect() const return QRectF(q->x(), q->y(), q->width(), q->height()); } -QPoint QQuickWebEngineViewPrivate::mapToGlobal(const QPoint &posInView) const -{ - Q_Q(const QQuickWebEngineView); - return q->window() ? q->window()->mapToGlobal(posInView) : QPoint(); -} - qreal QQuickWebEngineViewPrivate::dpiScale() const { return m_dpiScale; diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h index 332d9e280..6b61fb950 100644 --- a/src/webengine/api/qquickwebengineview_p_p.h +++ b/src/webengine/api/qquickwebengineview_p_p.h @@ -155,7 +155,6 @@ public: virtual void didUpdateTargetURL(const QUrl&) Q_DECL_OVERRIDE; virtual void selectionChanged() Q_DECL_OVERRIDE { } virtual QRectF viewportRect() const Q_DECL_OVERRIDE; - virtual QPoint mapToGlobal(const QPoint &posInView) const Q_DECL_OVERRIDE; virtual qreal dpiScale() const Q_DECL_OVERRIDE; virtual void loadStarted(const QUrl &provisionalUrl) Q_DECL_OVERRIDE; virtual void loadCommitted() Q_DECL_OVERRIDE; |