git.iko.soy/unity8
on xenial help sign in
Make the new test i just added pass
4bf19f0Albert Astals
plugins/ListViewWithPageHeader/listviewwithpageheader.cpp+1−1
compare with xenial
unifiedsplit
@@ -491,7 +491,7 @@ void ListViewWithPageHeader::viewportMoved(Qt::Orientations orient)
491 const bool notShownByItsOwn = contentY() + diff >= m_headerItem->y() + m_headerItem->height();
491 const bool notShownByItsOwn = contentY() + diff >= m_headerItem->y() + m_headerItem->height();
492 const bool maximizeVisibleAreaRunning = m_contentYAnimation->isRunning() && contentYAnimationType == ContentYAnimationMaximizeVisibleArea;
492 const bool maximizeVisibleAreaRunning = m_contentYAnimation->isRunning() && contentYAnimationType == ContentYAnimationMaximizeVisibleArea;
493
493
494− if (!scrolledUp && (contentY() == -m_minYExtent || m_previousContentY == m_headerItem->y())) {
494+ if (!scrolledUp && (contentY() == -m_minYExtent || (m_headerItemShownHeight == 0 && m_previousContentY == m_headerItem->y()))) {
495 m_headerItemShownHeight = 0;
495 m_headerItemShownHeight = 0;
496 m_headerItem->setY(-m_minYExtent);
496 m_headerItem->setY(-m_minYExtent);
497 } else if ((scrolledUp && notRebounding && notShownByItsOwn && !maximizeVisibleAreaRunning) || (m_headerItemShownHeight > 0)) {
497 } else if ((scrolledUp && notRebounding && notShownByItsOwn && !maximizeVisibleAreaRunning) || (m_headerItemShownHeight > 0)) {