summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Mollekopf <chrigi_1@fastmail.fm>2017-07-14 22:48:56 +0200
committerChristian Mollekopf <chrigi_1@fastmail.fm>2017-07-15 20:14:48 +0200
commit9895d72ea197c3bdc7e5465f1d96a249081b0e77 (patch)
tree342ce7084740ee81e34176dcf1fb48dabdbcb30c
parentd2e9a7f4b20bf59bc01fb577b72a42250ae335ce (diff)
downloadkube-9895d72ea197c3bdc7e5465f1d96a249081b0e77.tar.gz
kube-9895d72ea197c3bdc7e5465f1d96a249081b0e77.zip
Fixed scroll even forwarding with a webview
-rw-r--r--framework/qml/ConversationView.qml2
-rw-r--r--framework/qml/ListView.qml2
2 files changed, 3 insertions, 1 deletions
diff --git a/framework/qml/ConversationView.qml b/framework/qml/ConversationView.qml
index 2098ce3c..fb7a435e 100644
--- a/framework/qml/ConversationView.qml
+++ b/framework/qml/ConversationView.qml
@@ -141,7 +141,7 @@ Rectangle {
141 //necessary due to the webengineview 141 //necessary due to the webengineview
142 Kube.MouseProxy { 142 Kube.MouseProxy {
143 anchors.fill: parent 143 anchors.fill: parent
144 target: listView 144 target: listView.mouseProxy
145 forwardWheelEvents: true 145 forwardWheelEvents: true
146 } 146 }
147 } 147 }
diff --git a/framework/qml/ListView.qml b/framework/qml/ListView.qml
index 161fe48e..ed0b112f 100644
--- a/framework/qml/ListView.qml
+++ b/framework/qml/ListView.qml
@@ -23,8 +23,10 @@ import org.kube.framework 1.0 as Kube
23 23
24ListView { 24ListView {
25 id: root 25 id: root
26 property Item mouseProxy: scrollHelper
26 27
27 Kube.ScrollHelper { 28 Kube.ScrollHelper {
29 id: scrollHelper
28 flickable: root 30 flickable: root
29 anchors.fill: root 31 anchors.fill: root
30 } 32 }