summaryrefslogtreecommitdiffstats
path: root/src/webengine/render_widget_host_view_qt_delegate_quick.cpp
diff options
context:
space:
mode:
authorJocelyn Turcotte <jocelyn.turcotte@digia.com>2014-08-18 14:11:06 +0200
committerJocelyn Turcotte <jocelyn.turcotte@digia.com>2014-08-20 17:13:51 +0200
commit7717f941a349140497d5e689530a2bf31e8397da (patch)
tree10a59c8fdc08bbaabc4c3b21500b56c259021f1a /src/webengine/render_widget_host_view_qt_delegate_quick.cpp
parent7ea45766f6c49de9a81a387013fb1b98ab82766d (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/render_widget_host_view_qt_delegate_quick.cpp')
-rw-r--r--src/webengine/render_widget_host_view_qt_delegate_quick.cpp19
1 files changed, 17 insertions, 2 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 daca44071..5b37d9653 100644
--- a/src/webengine/render_widget_host_view_qt_delegate_quick.cpp
+++ b/src/webengine/render_widget_host_view_qt_delegate_quick.cpp
@@ -224,11 +224,26 @@ void RenderWidgetHostViewQtDelegateQuick::geometryChanged(const QRectF &newGeome
void RenderWidgetHostViewQtDelegateQuick::itemChange(ItemChange change, const ItemChangeData &value)
{
QQuickItem::itemChange(change, value);
- if (m_initialized && change == QQuickItem::ItemSceneChange)
- m_client->windowChanged();
+ if (change == QQuickItem::ItemSceneChange) {
+ foreach (const QMetaObject::Connection &c, m_windowConnections)
+ disconnect(c);
+ m_windowConnections.clear();
+ if (value.window) {
+ m_windowConnections.append(connect(value.window, SIGNAL(xChanged(int)), SLOT(onWindowPosChanged())));
+ m_windowConnections.append(connect(value.window, SIGNAL(yChanged(int)), SLOT(onWindowPosChanged())));
+ }
+
+ if (m_initialized)
+ m_client->windowChanged();
+ }
}
QSGNode *RenderWidgetHostViewQtDelegateQuick::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *)
{
return m_client->updatePaintNode(oldNode);
}
+
+void RenderWidgetHostViewQtDelegateQuick::onWindowPosChanged()
+{
+ m_client->windowBoundsChanged();
+}