on xenial help sign in
delay the contentheight dirty to when the animation finishes

Was causing some weird breakage in the phone

commit2455cb5b4a8581c21608d12d40da3d3614d06455 authorAlbert Astals <albert.astals@canonical.com> dateThu 27 Jun 2013, 18:11 (13 years ago) parent721aac9
2 files changed+8−1
plugins/ListViewWithPageHeader/listviewwithpageheader.cpp+7−1 plugins/ListViewWithPageHeader/listviewwithpageheader.h+1
plugins/ListViewWithPageHeader/listviewwithpageheader.cpp+7−1
@@ -162,6 +162,7 @@ ListViewWithPageHeader::ListViewWithPageHeader()
162162 connect(this, SIGNAL(contentWidthChanged()), this, SLOT(onContentWidthChanged()));
163163 connect(this, SIGNAL(contentHeightChanged()), this, SLOT(onContentHeightChanged()));
164164 connect(this, SIGNAL(heightChanged()), this, SLOT(onHeightChanged()));
165+ connect(m_headerShowAnimation, SIGNAL(stopped()), this, SLOT(onShowHeaderAnimationFinished()));
165166}
166167
167168ListViewWithPageHeader::~ListViewWithPageHeader()
@@ -408,7 +409,6 @@ void ListViewWithPageHeader::viewportMoved(Qt::Orientations orient)
408409 diff += oldHeaderItemShownHeight - m_headerItemShownHeight;
409410 } else {
410411 diff = -diff;
411− m_contentHeightDirty = true;
412412 }
413413 }
414414 if (!m_visibleItems.isEmpty()) {
@@ -851,6 +851,12 @@ void ListViewWithPageHeader::onModelUpdated(const QQuickChangeSet &changeSet, bo
851851 m_contentHeightDirty = true;
852852}
853853
854+void ListViewWithPageHeader::onShowHeaderAnimationFinished()
855+{
856+ m_contentHeightDirty = true;
857+ polish();
858+}
859+
854860void ListViewWithPageHeader::itemGeometryChanged(QQuickItem * /*item*/, const QRectF &newGeometry, const QRectF &oldGeometry)
855861{
856862 const qreal heightDiff = newGeometry.height() - oldGeometry.height();
plugins/ListViewWithPageHeader/listviewwithpageheader.h+1
@@ -84,6 +84,7 @@ private Q_SLOTS:
8484 void onContentWidthChanged();
8585 void onHeightChanged();
8686 void onModelUpdated(const QQuickChangeSet &changeSet, bool reset);
87+ void onShowHeaderAnimationFinished();
8788
8889private:
8990 class ListItem