summaryrefslogtreecommitdiffstats
path: root/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.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/webenginewidgets/render_widget_host_view_qt_delegate_widget.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/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp')
-rw-r--r--src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp21
1 files changed, 21 insertions, 0 deletions
diff --git a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
index 2fb03f02e..36ea5015f 100644
--- a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
+++ b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
@@ -201,6 +201,22 @@ void RenderWidgetHostViewQtDelegateWidget::resizeEvent(QResizeEvent *resizeEvent
m_client->notifyResize();
}
+void RenderWidgetHostViewQtDelegateWidget::showEvent(QShowEvent *event)
+{
+ QOpenGLWidget::showEvent(event);
+ // We don't have a way to catch a top-level window change with QWidget
+ // but a widget will most likely be shown again if it changes, so do
+ // the reconnection at this point.
+ foreach (const QMetaObject::Connection &c, m_windowConnections)
+ disconnect(c);
+ m_windowConnections.clear();
+ if (QWindow *w = window()) {
+ m_windowConnections.append(connect(w, SIGNAL(xChanged(int)), SLOT(onWindowPosChanged())));
+ m_windowConnections.append(connect(w, SIGNAL(yChanged(int)), SLOT(onWindowPosChanged())));
+ }
+ m_client->windowChanged();
+}
+
bool RenderWidgetHostViewQtDelegateWidget::event(QEvent *event)
{
bool handled = false;
@@ -248,3 +264,8 @@ void RenderWidgetHostViewQtDelegateWidget::paintGL()
m_sgRenderer->renderScene(defaultFramebufferObject());
}
+
+void RenderWidgetHostViewQtDelegateWidget::onWindowPosChanged()
+{
+ m_client->windowBoundsChanged();
+}