diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-04-01 10:27:13 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-08 14:00:06 +0200 |
| commit | 84f31c11b77a62212451cb77adae63219e06de96 (patch) | |
| tree | 97d252eee0ee8716d1a7165cd714b0d5b9552ebb /src/webengine/render_widget_host_view_qt_delegate_quickwindow.cpp | |
| parent | 3cb5203cb7a4bee9a867e8616c23ce635d6a8506 (diff) | |
Revert part of the RenderWidgetHostViewQtDelegate refactoring
This reverts parts of commit 9c198939be1ef064d1a2430a4b9991f2fe16f359.
This does keeps the popup fixes and removes support for
QWebEnginePage::setViewportSize and QWebEnginePage::render until
we can evaluate the needs vs the cost of such feature.
Change-Id: I1b55b751d463717b1462393ea8cd353422f8fdbb
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/webengine/render_widget_host_view_qt_delegate_quickwindow.cpp')
| -rw-r--r-- | src/webengine/render_widget_host_view_qt_delegate_quickwindow.cpp | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/src/webengine/render_widget_host_view_qt_delegate_quickwindow.cpp b/src/webengine/render_widget_host_view_qt_delegate_quickwindow.cpp index b1f2d7cea..7bf19d17a 100644 --- a/src/webengine/render_widget_host_view_qt_delegate_quickwindow.cpp +++ b/src/webengine/render_widget_host_view_qt_delegate_quickwindow.cpp @@ -44,9 +44,8 @@ #include <QQuickItem> -RenderWidgetHostViewQtDelegateQuickWindow::RenderWidgetHostViewQtDelegateQuickWindow(RenderWidgetHostViewQtDelegate *realDelegate, QQuickItem *parent) +RenderWidgetHostViewQtDelegateQuickWindow::RenderWidgetHostViewQtDelegateQuickWindow(RenderWidgetHostViewQtDelegate *realDelegate) : m_realDelegate(realDelegate) - , m_parentView(parent) { setFlags(Qt::ToolTip | Qt::FramelessWindowHint | Qt::WindowDoesNotAcceptFocus); } @@ -62,13 +61,10 @@ void RenderWidgetHostViewQtDelegateQuickWindow::initAsChild(WebContentsAdapterCl Q_UNREACHABLE(); } -void RenderWidgetHostViewQtDelegateQuickWindow::initAsPopup(const QRect &rect) +void RenderWidgetHostViewQtDelegateQuickWindow::initAsPopup(const QRect &screenRect) { - Q_ASSERT(m_parentView); - QPoint pos = m_parentView->window()->mapToGlobal(rect.topLeft()); - QRect geometry = QRect(pos, rect.size()); - m_realDelegate->initAsPopup(QRect(QPoint(0, 0), rect.size())); - setGeometry(geometry); + m_realDelegate->initAsPopup(QRect(QPoint(0, 0), screenRect.size())); + setGeometry(screenRect); raise(); show(); } @@ -95,7 +91,7 @@ bool RenderWidgetHostViewQtDelegateQuickWindow::isVisible() const QWindow *RenderWidgetHostViewQtDelegateQuickWindow::window() const { - return m_parentView->window(); + return const_cast<RenderWidgetHostViewQtDelegateQuickWindow*>(this); } void RenderWidgetHostViewQtDelegateQuickWindow::update(const QRect &rect) @@ -116,11 +112,9 @@ void RenderWidgetHostViewQtDelegateQuickWindow::resize(int width, int height) m_realDelegate->resize(width, height); } -void RenderWidgetHostViewQtDelegateQuickWindow::move(const QPoint &pos) +void RenderWidgetHostViewQtDelegateQuickWindow::move(const QPoint &screenPos) { - Q_ASSERT(m_parentView); - QPoint mapped = m_parentView->window()->mapToGlobal(pos); - QQuickWindow::setPosition(mapped.x(), mapped.y()); + QQuickWindow::setPosition(screenPos); } void RenderWidgetHostViewQtDelegateQuickWindow::setTooltip(const QString &tooltip) |