diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-12-22 13:13:50 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-12-23 23:24:36 +0000 |
| commit | abf030cead015752b22774b46e290e3a5e4ef4e4 (patch) | |
| tree | e9cb5a29a8b16e5b18b41e61a9254da4fe6c2698 /src | |
| parent | 9c4621217f47b8427e284423d4e5c5e4dba00bfc (diff) | |
Fix ListView.OverlayHeader
Infinite loop because of rounding in QQuickFlickablePrivate::fixup().
Change-Id: Icffe216587d90660ac3cb8090a676868416566c8
Task-number: QTBUG-50105
Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
Diffstat (limited to 'src')
| -rw-r--r-- | src/quick/items/qquickflickable.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/items/qquickflickable.cpp b/src/quick/items/qquickflickable.cpp index 092d4afdd9..43405db40d 100644 --- a/src/quick/items/qquickflickable.cpp +++ b/src/quick/items/qquickflickable.cpp @@ -435,12 +435,12 @@ void QQuickFlickablePrivate::clearTimeline() void QQuickFlickablePrivate::fixup(AxisData &data, qreal minExtent, qreal maxExtent) { - if (data.move.value() > minExtent || maxExtent > minExtent) { + if (data.move.value() >= minExtent || maxExtent > minExtent) { resetTimeline(data); if (data.move.value() != minExtent) { adjustContentPos(data, minExtent); } - } else if (data.move.value() < maxExtent) { + } else if (data.move.value() <= maxExtent) { resetTimeline(data); adjustContentPos(data, maxExtent); } else if (-qRound(-data.move.value()) != data.move.value()) { |