Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-11 09:32:12 +01:00
Code Releases Activity

WebView: Fix finding rwhvqt with Qt 5.8

Browse Source
This commit is contained in:
David Rosca 2016-12-24 16:19:34 +01:00
parent 96202a6fe0
commit 2ad5e82ce2
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/lib/webengine/webview.cpp
View File

@ -45,6 +45,7 @@
#include <QHostInfo>
#include <QMimeData>
#include <QWebEngineContextMenuData>
#include <QStackedLayout>
bool WebView::s_forceContextMenuOnMouseRelease = false;
@ -65,8 +66,24 @@ WebView::WebView(QWidget* parent)
setAcceptDrops(true);
installEventFilter(this);
if (parentWidget()) {
parentWidget()->installEventFilter(this);
}
WebInspector::registerView(this);
// Hack to find widget that receives input events
QStackedLayout *l = qobject_cast<QStackedLayout*>(layout());
connect(l, &QStackedLayout::currentChanged, this, [this]() {
QTimer::singleShot(0, this, [this]() {
m_rwhvqt = focusProxy();
if (!m_rwhvqt) {
qCritical() << "Focus proxy is null!";
return;
}
m_rwhvqt->installEventFilter(this);
});
});
}
WebView::~WebView()
@ -1154,18 +1171,9 @@ void WebView::loadRequest(const LoadRequest &req)
bool WebView::eventFilter(QObject *obj, QEvent *event)
{
// Hack to find widget that receives input events
if (obj == this && event->type() == QEvent::ChildAdded) {
QWidget *child = qobject_cast<QWidget*>(static_cast<QChildEvent*>(event)->child());
if (child && child->inherits("QtWebEngineCore::RenderWidgetHostViewQtDelegateWidget")) {
m_rwhvqt = child;
m_rwhvqt->installEventFilter(this);
}
}
// Keyboard events are sent to parent widget
if (obj == this && event->type() == QEvent::ParentChange && parent()) {
parent()->installEventFilter(this);
if (obj == this && event->type() == QEvent::ParentChange && parentWidget()) {
parentWidget()->installEventFilter(this);
}
// Forward events to WebView