From f696d01e72024e710a9d1d5dbbf7399ed367ccff Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Wed, 5 Mar 2014 16:47:39 +0100 Subject: [PATCH] QmlProfiler: Don't needlessly interrupt the timeline flicking motion If the timeline is being flicked and we manually set contentX from the zoomControl callback it will stop. That's unnecessary as the flicking itself will trigger further updates to zoomControl. Change-Id: Id14bde1bb33d6b1f6d719a41df23074981e474da Reviewed-by: Kai Koehne --- src/plugins/qmlprofiler/qml/MainView.qml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/plugins/qmlprofiler/qml/MainView.qml b/src/plugins/qmlprofiler/qml/MainView.qml index 8659e5e8ba8..ab647748199 100644 --- a/src/plugins/qmlprofiler/qml/MainView.qml +++ b/src/plugins/qmlprofiler/qml/MainView.qml @@ -341,10 +341,12 @@ Rectangle { if (start !== startTime || end !== endTime) { startTime = start; endTime = end; - var newStartX = (startTime - qmlProfilerModelProxy.traceStartTime()) * - flick.width / (endTime-startTime); - if (isFinite(newStartX) && Math.abs(newStartX - flick.contentX) >= 1) - flick.contentX = newStartX; + if (!flick.flickingHorizontally) { + var newStartX = (startTime - qmlProfilerModelProxy.traceStartTime()) * + flick.width / (endTime-startTime); + if (isFinite(newStartX) && Math.abs(newStartX - flick.contentX) >= 1) + flick.contentX = newStartX; + } } }