From e2c296c46b3f922ed12f83b166b1493dfded480e Mon Sep 17 00:00:00 2001 From: Erik Verbruggen Date: Mon, 11 Apr 2016 12:44:00 +0200 Subject: QML: Pass the kind of geometry change around This prevents re-calculation of what actually changed, and removes the now unused parameter newGeometry. Other than this change calculation, the only place where oldGeometry was used is QQuickListViewPrivate::itemGeometryChanged. To get rid of oldGeometry too, QQuickListViewPrivate now stores the current (i.e. last known) geometry, and updates it in itemGeometryChanged. Change-Id: I8a5286d08a04132c9a4c81de7ce221f5676946e6 Reviewed-by: Frederik Gladhorn Reviewed-by: Robin Burchell --- src/quick/items/qquickshadereffectsource.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/quick/items/qquickshadereffectsource.cpp') diff --git a/src/quick/items/qquickshadereffectsource.cpp b/src/quick/items/qquickshadereffectsource.cpp index d74dd99fe8..a60a06f59a 100644 --- a/src/quick/items/qquickshadereffectsource.cpp +++ b/src/quick/items/qquickshadereffectsource.cpp @@ -308,11 +308,11 @@ QQuickItem *QQuickShaderEffectSource::sourceItem() const return m_sourceItem; } -void QQuickShaderEffectSource::itemGeometryChanged(QQuickItem *item, const QRectF &newRect, const QRectF &oldRect) +void QQuickShaderEffectSource::itemGeometryChanged(QQuickItem *item, QQuickGeometryChange change, const QRectF &) { Q_ASSERT(item == m_sourceItem); Q_UNUSED(item); - if (newRect.size() != oldRect.size()) + if (change.sizeChange()) update(); } -- cgit v1.2.3