From 217012da25fb607f564b87583f193a4c50dde2f2 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Mon, 27 Apr 2020 11:05:40 +0200 Subject: [PATCH] fix build --- resources/scripts/.appveyor-build-win.ps1 | 2 ++ src/librssguard/gui/webviewer.cpp | 14 ++++++++++++++ src/librssguard/gui/webviewer.h | 1 + 3 files changed, 17 insertions(+) diff --git a/resources/scripts/.appveyor-build-win.ps1 b/resources/scripts/.appveyor-build-win.ps1 index 9bfa7ebb4..b1e55c57d 100644 --- a/resources/scripts/.appveyor-build-win.ps1 +++ b/resources/scripts/.appveyor-build-win.ps1 @@ -1,5 +1,7 @@ # List startup folder. $old_pwd=$pwd.Path + +ls "$env:QTDIR" ls echo "Qmake args are: '$env:qmake_args'." diff --git a/src/librssguard/gui/webviewer.cpp b/src/librssguard/gui/webviewer.cpp index d7136b1f0..ac5210d3d 100644 --- a/src/librssguard/gui/webviewer.cpp +++ b/src/librssguard/gui/webviewer.cpp @@ -21,6 +21,12 @@ WebViewer::WebViewer(QWidget* parent) : QWebEngineView(parent), m_root(nullptr) connect(page, &WebPage::messageStatusChangeRequested, this, &WebViewer::messageStatusChangeRequested); setPage(page); + + const QList children = findChildren(); + + for (QWidget* child : children) { + child->installEventFilter(this); + } } bool WebViewer::canIncreaseZoom() { @@ -182,6 +188,14 @@ void WebViewer::wheelEvent(QWheelEvent* event) { } } +bool WebViewer::eventFilter(QObject* object, QEvent* event) { + if (event->type() == QEvent::Type::Wheel) { + return true; + } + + return false; +} + RootItem* WebViewer::root() const { return m_root; } diff --git a/src/librssguard/gui/webviewer.h b/src/librssguard/gui/webviewer.h index 96d6ed837..1bcaa23c7 100644 --- a/src/librssguard/gui/webviewer.h +++ b/src/librssguard/gui/webviewer.h @@ -42,6 +42,7 @@ class WebViewer : public QWebEngineView { QWebEngineView* createWindow(QWebEnginePage::WebWindowType type); void wheelEvent(QWheelEvent* event); + bool eventFilter(QObject* object, QEvent* event); signals: void messageStatusChangeRequested(int message_id, WebPage::MessageStatusChange change);