5 files changed, 90 insertions, 0 deletions

diff --git a/components/package/contents/ui/SingleMailView.qml b/components/package/contents/ui/SingleMailView.qml
index b44659f9..41c75224 100644
--- a/components/package/contents/ui/SingleMailView.qml
+++ b/components/package/contents/ui/SingleMailView.qml
@@ -99,6 +99,7 @@ Item {
 
 
     ListView {
+        id: listView
         anchors {
             top: subjectBar.bottom
             left: parent.left
@@ -124,6 +125,14 @@ Item {
         }
 
         delegate: mailDelegate
+
+        //Intercept all scroll events,
+        //necessary due to the webengineview
+        KubeFramework.MouseProxy {
+            anchors.fill: parent
+            target: listView
+            forwardWheelEvents: true
+        }
     }
     Component {
         id: mailDelegate
diff --git a/framework/domain/CMakeLists.txt b/framework/domain/CMakeLists.txt
index 70a86d01..00499f30 100644
--- a/framework/domain/CMakeLists.txt
+++ b/framework/domain/CMakeLists.txt
@@ -26,6 +26,7 @@ set(mailplugin_SRCS
     outboxcontroller.cpp
     mailcontroller.cpp
     foldercontroller.cpp
+    mouseproxy.cpp
 )
 find_package(KF5 REQUIRED COMPONENTS Package)
 
diff --git a/framework/domain/mailplugin.cpp b/framework/domain/mailplugin.cpp
index e63f3ad1..f9dbe3ec 100644
--- a/framework/domain/mailplugin.cpp
+++ b/framework/domain/mailplugin.cpp
@@ -32,6 +32,7 @@
 #include "outboxcontroller.h"
 #include "mailcontroller.h"
 #include "foldercontroller.h"
+#include "mouseproxy.h"
 
 #include <QtQml>
 
@@ -51,4 +52,5 @@ void MailPlugin::registerTypes (const char *uri)
     qmlRegisterType<OutboxModel>(uri, 1, 0, "OutboxModel");
     qmlRegisterType<MailController>(uri, 1, 0, "MailController");
     qmlRegisterType<FolderController>(uri, 1, 0, "FolderController");
+    qmlRegisterType<MouseProxy>(uri, 1, 0, "MouseProxy");
 }
diff --git a/framework/domain/mouseproxy.cpp b/framework/domain/mouseproxy.cpp
new file mode 100644
index 00000000..9944acb6
--- /dev/null
+++ b/framework/domain/mouseproxy.cpp
@@ -0,0 +1,39 @@
+/*
+    Copyright (c) 2017 Christian Mollekopf <mollekopf@kolabsys.com>
+
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This library is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+    License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
+*/
+#include "mouseproxy.h"
+
+MouseProxy::MouseProxy(QQuickItem *parent)
+    : QQuickItem(parent)
+{
+
+}
+
+MouseProxy::~MouseProxy()
+{
+
+}
+
+void MouseProxy::wheelEvent(QWheelEvent *event)
+{
+    if (mTarget && mForwardWheelEvents) {
+        mTarget->event(event);
+    } else {
+        QQuickItem::wheelEvent(event);
+    }
+}
diff --git a/framework/domain/mouseproxy.h b/framework/domain/mouseproxy.h
new file mode 100644
index 00000000..67b25d06
--- /dev/null
+++ b/framework/domain/mouseproxy.h
@@ -0,0 +1,39 @@
+/*
+    Copyright (c) 2017 Christian Mollekopf <mollekopf@kolabsys.com>
+
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This library is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+    License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
+*/
+#include <QQuickItem>
+
+class MouseProxy : public QQuickItem
+{
+    Q_OBJECT
+
+    Q_PROPERTY(QObject* target MEMBER mTarget)
+    Q_PROPERTY(bool forwardWheelEvents MEMBER mForwardWheelEvents)
+
+public:
+    MouseProxy(QQuickItem *parent=0);
+    ~MouseProxy();
+
+protected:
+    virtual void wheelEvent(QWheelEvent *event) override;
+
+private:
+    QObject *mTarget = nullptr;
+    bool mForwardWheelEvents = false;
+};
+