← Back to branch summary

~ci-train-bot/unity8/unity8-ubuntu-zesty-2404

« back to all changes in this revision

Viewing changes to plugins/Dash/listviewwithpageheader.cpp

  • Committer: Nick Dedekind
  • Date: 2016-11-28 13:46:55 UTC
  • mfrom: (2704 unity8)
  • mto: This revision was merged to the branch mainline in revision 2752.
  • Revision ID: nick.dedekind@canonical.com-20161128134655-vd70a64pbci1b4oc
merged with trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/Dash/listviewwithpageheader.cpp
772
772
            delete nobj;
773
773
        } else {
774
774
            sectionItem->setProperty("text", sectionText);
775
 
            sectionItem->setProperty("delegateIndex", -1);
 
775
            sectionItem->setProperty("delegate", QVariant());
776
776
            sectionItem->setZ(2);
777
777
            QQml_setParent_noEvent(sectionItem, m_clipItem);
778
778
            sectionItem->setParentItem(m_clipItem);
929
929
                polish();
930
930
            }
931
931
            if (listItem->sectionItem()) {
932
 
                listItem->sectionItem()->setProperty("delegateIndex", modelIndex);
 
932
                listItem->sectionItem()->setProperty("delegate", QVariant::fromValue(listItem->m_item));
933
933
            }
934
934
            adjustMinYExtent();
935
935
            m_contentHeightDirty = true;
1123
1123
    for (int i = 0; i < m_visibleItems.count(); ++i) {
1124
1124
        ListItem *item = m_visibleItems[i];
1125
1125
        if (item->sectionItem()) {
1126
 
            item->sectionItem()->setProperty("delegateIndex", m_firstVisibleIndex + i);
 
1126
            item->sectionItem()->setProperty("delegate", QVariant::fromValue(item->m_item));
1127
1127
        }
1128
1128
    }
1129
1129
 
1297
1297
 
1298
1298
                        QQuickItemPrivate::get(m_topSectionItem)->setCulled(false);
1299
1299
                        m_topSectionItem->setY(topSectionStickPos);
1300
 
                        int delegateIndex = modelIndex;
1301
 
                        // Look for the first index with this section text
1302
 
                        while (delegateIndex > 0) {
1303
 
                            const QString prevSection = m_delegateModel->stringValue(delegateIndex - 1, m_sectionProperty);
1304
 
                            if (prevSection != section)
1305
 
                                break;
1306
 
                            delegateIndex--;
1307
 
                        }
1308
 
                        m_topSectionItem->setProperty("delegateIndex", delegateIndex);
 
1300
                        m_topSectionItem->setProperty("delegate", QVariant::fromValue(item->m_item));
1309
1301
                        if (item->sectionItem()) {
1310
1302
                            QQuickItemPrivate::get(item->sectionItem())->setCulled(true);
1311
1303
                        }