From abf030cead015752b22774b46e290e3a5e4ef4e4 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Tue, 22 Dec 2015 13:13:50 +0100 Subject: Fix ListView.OverlayHeader Infinite loop because of rounding in QQuickFlickablePrivate::fixup(). Change-Id: Icffe216587d90660ac3cb8090a676868416566c8 Task-number: QTBUG-50105 Reviewed-by: Robin Burchell --- src/quick/items/qquickflickable.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/quick') 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()) { -- cgit v1.2.3