aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArthur Mello <arthur.mello@canonical.com>2014-02-19 09:37:15 -0300
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-02-19 19:41:12 +0100
commit37bd5257da0858c134ae20847afc830e04ea68cb (patch)
tree6256e4a4bc99ecd75196754d6e8f6b6758da70c0
parenta7e013a3ae9a492266974417ffd547307cb7d7e2 (diff)
Guarantee event's default state as not accepted
Before starting the evaluation of the event to check if it should be accepted or not, set the state of the wheelEvent to not accepted. That way, if the event is not accepted it will be propagated to others elements. Change-Id: I13a71db8e26c888adc03f1bfd3e46480d3b22b6f Task-number: QTBUG-36774 Reviewed-by: Gustavo Pichorim Boiko <gustavo.boiko@canonical.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
-rw-r--r--src/quick/items/qquickflickable.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/quick/items/qquickflickable.cpp b/src/quick/items/qquickflickable.cpp
index 789d1952c0..2f2c932db5 100644
--- a/src/quick/items/qquickflickable.cpp
+++ b/src/quick/items/qquickflickable.cpp
@@ -1262,6 +1262,8 @@ void QQuickFlickable::wheelEvent(QWheelEvent *event)
return;
}
+ event->setAccepted(false);
+
int yDelta = event->angleDelta().y();
int xDelta = event->angleDelta().x();
if (yflick() && yDelta != 0) {