5602cfa · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

Calculate heightToClip correctly for non first items of a section chain

5602cfaAlbert Astals13 years ago

plugins/ListViewWithPageHeader/listviewwithpageheader.cpp+3−2

compare with xenial

unifiedsplit

@@ -967,8 +967,9 @@ void ListViewWithPageHeader::layout()

967 }

968 }

969 QQmlContext *context = QQmlEngine::contextForObject(item->m_item)->parentContext();

970+ const qreal clipFrom = visibleFrom + (!item->m_sectionItem && m_topSectionItem && !QQuickItemPrivate::get(m_topSectionItem)->culled ? m_topSectionItem->height() : 0);

970− if (!cull && pos < visibleFrom) {

971+ if (!cull && pos < clipFrom) {

971− context->setContextProperty(QLatin1String("heightToClip"), visibleFrom - pos);

972+ context->setContextProperty(QLatin1String("heightToClip"), clipFrom - pos);

972 } else {

973 } else {

973 context->setContextProperty(QLatin1String("heightToClip"), QVariant::fromValue<int>(0));

974 context->setContextProperty(QLatin1String("heightToClip"), QVariant::fromValue<int>(0));

974 }

975 }