diff options
author | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2019-10-11 09:54:18 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2019-10-11 09:54:18 +0200 |
commit | aa268cae8df5a65106a48c0764b31118d8bf5f1e (patch) | |
tree | e1564d7bc3c6b8233d334e0ac41641da242a1839 /src/quick/items/qquickpathview.cpp | |
parent | bbc5e0f2d25618b1e170b5f92fda3089e5f3965a (diff) | |
parent | 6ec54900daf5290c6f147f1d539f3408bf78cf33 (diff) |
Merge 5.13 into 5.13.2
Change-Id: Ib1a7bdda1cde721efb356b2d043b26e2db7386ae
Diffstat (limited to 'src/quick/items/qquickpathview.cpp')
-rw-r--r-- | src/quick/items/qquickpathview.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/quick/items/qquickpathview.cpp b/src/quick/items/qquickpathview.cpp index e4480b335a..8abb3f29cd 100644 --- a/src/quick/items/qquickpathview.cpp +++ b/src/quick/items/qquickpathview.cpp @@ -1680,11 +1680,12 @@ void QQuickPathViewPrivate::handleMousePressEvent(QMouseEvent *event) return; } - - if (tl.isActive() && flicking && flickDuration && qreal(tl.time())/flickDuration < 0.8) + if (tl.isActive() && flicking && flickDuration && qreal(tl.time()) / flickDuration < 0.8) { stealMouse = true; // If we've been flicked then steal the click. - else + q->grabMouse(); // grab it right now too, just to be sure (QTBUG-77173) + } else { stealMouse = false; + } q->setKeepMouseGrab(stealMouse); timer.start(); |