diff options
author | Michal Klocek <michal.klocek@qt.io> | 2021-02-10 12:02:57 +0100 |
---|---|---|
committer | Michal Klocek <michal.klocek@qt.io> | 2021-04-13 09:32:55 +0200 |
commit | 919dd97e835f469609a0710eb91f829a6d70e88c (patch) | |
tree | 90c9044585d8f9b71776a4cbf1f4ef4a34a7076b /src/webengine/render_widget_host_view_qt_delegate_quickwindow.cpp | |
parent | 29d45bf2d105b43d8cedc923869960091771d2a1 (diff) |
Fix 'WebEngine' ambiguity for Qt6
'WebEngine' is a qml module, however name itself
is ambiguous. Thefore now with Qt6 and with cmake
port name the module as WebEngineQuick.
Change-Id: I948672dd5d389a01c6a31ec871459164fd989c0f
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
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 | 132 |
1 files changed, 0 insertions, 132 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 deleted file mode 100644 index c6d866033..000000000 --- a/src/webengine/render_widget_host_view_qt_delegate_quickwindow.cpp +++ /dev/null @@ -1,132 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtWebEngine module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "render_widget_host_view_qt_delegate_quickwindow.h" - -#include "qquickwebengineview_p_p.h" -#include <QQuickItem> - -namespace QtWebEngineCore { - -static inline QPoint getOffset(QQuickItem *item) -{ - // get parent window (scene) offset - QPointF offset = item->mapFromScene(QPoint(0, 0)); - offset = item->mapToGlobal(offset); - // get local offset - offset -= item->mapToScene(QPoint(0, 0)); - return offset.toPoint(); -} - -RenderWidgetHostViewQtDelegateQuickWindow::RenderWidgetHostViewQtDelegateQuickWindow( - RenderWidgetHostViewQtDelegateQuick *realDelegate, QWindow *parent) - : QQuickWindow(parent), m_realDelegate(realDelegate), m_virtualParent(nullptr) -{ - setFlags(Qt::Tool | Qt::WindowStaysOnTopHint | Qt::FramelessWindowHint | Qt::WindowDoesNotAcceptFocus); -} - -RenderWidgetHostViewQtDelegateQuickWindow::~RenderWidgetHostViewQtDelegateQuickWindow() -{ -} - -void RenderWidgetHostViewQtDelegateQuickWindow::setVirtualParent(QQuickItem *virtualParent) -{ - Q_ASSERT(virtualParent); - m_virtualParent = virtualParent; -} - -void RenderWidgetHostViewQtDelegateQuickWindow::initAsPopup(const QRect &rect) -{ - m_realDelegate->setSize(rect.size()); - QRect geometry(rect); - geometry.moveTo(rect.topLeft() - getOffset(m_virtualParent)); - setGeometry(geometry); - raise(); - show(); -} - -QRectF RenderWidgetHostViewQtDelegateQuickWindow::viewGeometry() const -{ - return geometry(); -} - -QRect RenderWidgetHostViewQtDelegateQuickWindow::windowGeometry() const -{ - return frameGeometry(); -} - -void RenderWidgetHostViewQtDelegateQuickWindow::show() -{ - QQuickWindow::show(); - m_realDelegate->show(); -} - -void RenderWidgetHostViewQtDelegateQuickWindow::hide() -{ - QQuickWindow::hide(); - m_realDelegate->hide(); -} - -bool RenderWidgetHostViewQtDelegateQuickWindow::isVisible() const -{ - return QQuickWindow::isVisible(); -} - -QWindow *RenderWidgetHostViewQtDelegateQuickWindow::window() const -{ - return const_cast<RenderWidgetHostViewQtDelegateQuickWindow*>(this); -} - -void RenderWidgetHostViewQtDelegateQuickWindow::updateCursor(const QCursor &cursor) -{ - setCursor(cursor); -} - -void RenderWidgetHostViewQtDelegateQuickWindow::resize(int width, int height) -{ - QQuickWindow::resize(width, height); - m_realDelegate->resize(width, height); -} - -void RenderWidgetHostViewQtDelegateQuickWindow::move(const QPoint &screenPos) -{ - QQuickWindow::setPosition(screenPos - getOffset(m_virtualParent)); -} - -} // namespace QtWebEngineCore |