eed5bda · unity8 · git.iko.soy

plugins/Dash/listviewwithpageheader.cpp+18−9

compare with xenial

unifiedsplit

@@ -219,13 +219,7 @@ void ListViewWithPageHeader::setDelegate(QQmlComponent *delegate)

219 Q_FOREACH(ListItem *item, m_visibleItems)

220 releaseItem(item);

221 m_visibleItems.clear();

222− m_firstVisibleIndex = -1;

222+ initializeValuesForEmptyList();

223− adjustMinYExtent();

224− setContentY(0);

225− m_clipItem->setY(0);

226− if (m_topSectionItem) {

227− QQuickItemPrivate::get(m_topSectionItem)->setCulled(true);

228− }

229

223

230 m_delegateModel->setDelegate(delegate);

224 m_delegateModel->setDelegate(delegate);

231

225

@@ -236,6 +230,17 @@ void ListViewWithPageHeader::setDelegate(QQmlComponent *delegate)

236 }

230 }

237}

231}

238

232

233+void ListViewWithPageHeader::initializeValuesForEmptyList()

234+{

235+ m_firstVisibleIndex = -1;

236+ adjustMinYExtent();

237+ setContentY(0);

238+ m_clipItem->setY(0);

239+ if (m_topSectionItem) {

240+ QQuickItemPrivate::get(m_topSectionItem)->setCulled(true);

241+ }

242+}

243+

239QQuickItem *ListViewWithPageHeader::header() const

244QQuickItem *ListViewWithPageHeader::header() const

240{

245{

241 return m_headerItem;

246 return m_headerItem;

@@ -835,7 +840,7 @@ bool ListViewWithPageHeader::removeNonVisibleItems(qreal bufferFrom, qreal buffe

835 }

840 }

836 }

841 }

837 if (!foundVisible) {

842 if (!foundVisible) {

838− m_firstVisibleIndex = -1;

843+ initializeValuesForEmptyList();

839 }

844 }

840 if (m_firstVisibleIndex != oldFirstVisibleIndex) {

845 if (m_firstVisibleIndex != oldFirstVisibleIndex) {

841 adjustMinYExtent();

846 adjustMinYExtent();

@@ -1092,7 +1097,11 @@ void ListViewWithPageHeader::onModelUpdated(const QQmlChangeSet &changeSet, bool

1092 }

1097 }

1093

1098

1094 if (m_firstVisibleIndex != oldFirstVisibleIndex) {

1099 if (m_firstVisibleIndex != oldFirstVisibleIndex) {

1100+ if (m_visibleItems.isEmpty()) {

1101+ initializeValuesForEmptyList();

1102+ } else {

1095− adjustMinYExtent();

1103+ adjustMinYExtent();

1104+ }

1096 }

1105 }

1097

1106

1098 for (int i = 0; i < m_visibleItems.count(); ++i) {

1107 for (int i = 0; i < m_visibleItems.count(); ++i) {

plugins/Dash/listviewwithpageheader.h+1

@@ -168,6 +168,7 @@ private:

168 QQuickItem *getSectionItem(int modelIndex, bool alreadyInserted);

169 QQuickItem *getSectionItem(const QString &sectionText);

170 void updateSectionItem(int modelIndex);

171+ void initializeValuesForEmptyList();

171

172

172 QQmlDelegateModel *m_delegateModel;

173 QQmlDelegateModel *m_delegateModel;

173

174

tests/plugins/Dash/listviewwithpageheadertest.cpp+23

@@ -1954,6 +1954,29 @@ private Q_SLOTS:

1954 QCOMPARE(lvwph->m_firstVisibleIndex, 0);

1955 }

1956

1957+ void testBug1540490()

1958+ {

1959+ lvwph->header()->setImplicitHeight(150);

1960+ verifyItem(0, 150., 150., false);

1961+

1962+ QMetaObject::invokeMethod(model, "removeItems", Q_ARG(QVariant, 3), Q_ARG(QVariant, 3));

1963+ model->setProperty(0, "size", 400);

1964+ model->setProperty(1, "size", 600);

1965+ model->setProperty(2, "size", 300);

1966+

1967+ scrollToBottom();

1968+ changeContentY(-200);

1969+

1970+ QMetaObject::invokeMethod(model, "removeItems", Q_ARG(QVariant, 1), Q_ARG(QVariant, 2));

1971+ model->setProperty(0, "size", 100);

1972+ QMetaObject::invokeMethod(model, "removeItems", Q_ARG(QVariant, 0), Q_ARG(QVariant, 1));

1973+ lvwph->header()->setImplicitHeight(50);

1974+ QMetaObject::invokeMethod(model, "insertItem", Q_ARG(QVariant, 0), Q_ARG(QVariant, 200));

1975+

1976+ QTRY_COMPARE(lvwph->m_visibleItems.count(), 1);

1977+ verifyItem(0, 50., 200., false);

1978+ }

1979+

1957private:

1980private:

1958 QQuickView *view;

1981 QQuickView *view;

1959 ListViewWithPageHeader *lvwph;

1982 ListViewWithPageHeader *lvwph;

tests/plugins/Dash/listviewwithpageheadertest.qml−1

@@ -85,7 +85,6 @@ Rectangle {

85 pageHeader: Rectangle {

86 color: "transparent"

87 width: parent.width

88− height: 50

89 implicitHeight: 50

88 implicitHeight: 50

90 Text {

89 Text {

91 anchors.fill: parent

90 anchors.fill: parent