82a456d · unity8 · git.iko.soy

git.iko.soy/unity8

Merge sectionDelegateResizes

commit82a456d4fe69ad946dfa9dd59bf5279d74d349f0 authorAlbert Astals Cid <albert.astals@canonical.com> dateThu 24 Mar 2016, 11:57 (11 years ago) parent50e6ee1 a9624f4

4 files changed+39−12

compare with xenial

unifiedsplit

plugins/Dash/listviewwithpageheader.cpp+22−10 plugins/Dash/listviewwithpageheader.h+1−1 tests/plugins/Dash/listviewwithpageheadersectiontest.cpp+15 tests/plugins/Dash/listviewwithpageheadertestsection.qml+1−1

plugins/Dash/listviewwithpageheader.cpp+22−10

@@ -286,7 +286,7 @@ void ListViewWithPageHeader::setSectionDelegate(QQmlComponent *delegate)

286286

287287 m_sectionDelegate = delegate;

288288

289− m_topSectionItem = getSectionItem(QString());

289+ m_topSectionItem = getSectionItem(QString(), false /*watchGeometry*/);

290290 m_topSectionItem->setZ(3);

291291 QQuickItemPrivate::get(m_topSectionItem)->setCulled(true);

292292 connect(m_topSectionItem, &QQuickItem::heightChanged, this, &ListViewWithPageHeader::stickyHeaderHeightChanged);

@@ -701,8 +701,10 @@ void ListViewWithPageHeader::reallyReleaseItem(ListItem *listItem)

701701

702702void ListViewWithPageHeader::releaseItem(ListItem *listItem)

703703{

704− QQuickItemPrivate *itemPrivate = QQuickItemPrivate::get(listItem->m_item);

705− itemPrivate->removeItemChangeListener(this, QQuickItemPrivate::Geometry);

704+ QQuickItemPrivate::get(listItem->m_item)->removeItemChangeListener(this, QQuickItemPrivate::Geometry);

705+ if (listItem->sectionItem()) {

706+ QQuickItemPrivate::get(listItem->sectionItem())->removeItemChangeListener(this, QQuickItemPrivate::Geometry);

707+ }

706708 m_itemsToRelease << listItem;

707709}

708710

@@ -745,7 +747,7 @@ QQuickItem *ListViewWithPageHeader::getSectionItem(int modelIndex, bool alreadyI

745747 return getSectionItem(section);

746748}

747749

748−QQuickItem *ListViewWithPageHeader::getSectionItem(const QString &sectionText)

750+QQuickItem *ListViewWithPageHeader::getSectionItem(const QString &sectionText, bool watchGeometry)

749751{

750752 QQuickItem *sectionItem = nullptr;

751753

@@ -769,7 +771,9 @@ QQuickItem *ListViewWithPageHeader::getSectionItem(const QString &sectionText)

769771 }

770772 m_sectionDelegate->completeCreate();

771773

772− // TODO attach to sectionItem so we can accomodate to it changing its height

774+ if (watchGeometry) {

775+ QQuickItemPrivate::get(sectionItem)->addItemChangeListener(this, QQuickItemPrivate::Geometry);

776+ }

773777

774778 return sectionItem;

775779}

@@ -1125,15 +1129,23 @@ void ListViewWithPageHeader::contentYAnimationRunningChanged(bool running)

11251129 }

11261130}

11271131

1128−void ListViewWithPageHeader::itemGeometryChanged(QQuickItem * /*item*/, const QRectF &newGeometry, const QRectF &oldGeometry)

1132+void ListViewWithPageHeader::itemGeometryChanged(QQuickItem *item, const QRectF &newGeometry, const QRectF &oldGeometry)

11291133{

11301134 const qreal heightDiff = newGeometry.height() - oldGeometry.height();

11311135 if (heightDiff != 0) {

1132− if (!m_inContentHeightKeepHeaderShown && oldGeometry.y() + oldGeometry.height() + m_clipItem->y() <= contentY() && !m_visibleItems.isEmpty()) {

1136+ if (!m_visibleItems.isEmpty()) {

11331137 ListItem *firstItem = m_visibleItems.first();

1134− firstItem->setY(firstItem->y() - heightDiff);

1135− adjustMinYExtent();

1136− layout();

1138+ const auto prevFirstItemY = firstItem->y();

1139+ if (!m_inContentHeightKeepHeaderShown && oldGeometry.y() + oldGeometry.height() + m_clipItem->y() <= contentY()) {

1140+ firstItem->setY(firstItem->y() - heightDiff);

1141+ } else if (item == firstItem->sectionItem()) {

1142+ firstItem->setY(firstItem->y() + heightDiff);

1143+ }

1144+

1145+ if (firstItem->y() != prevFirstItemY) {

1146+ adjustMinYExtent();

1147+ layout();

1148+ }

11371149 }

11381150 refill();

11391151 adjustMinYExtent();

plugins/Dash/listviewwithpageheader.h+1−1

@@ -166,7 +166,7 @@ private:

166166 void reallyReleaseItem(ListItem *item);

167167 void updateWatchedRoles();

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

169− QQuickItem *getSectionItem(const QString &sectionText);

169+ QQuickItem *getSectionItem(const QString &sectionText, bool watchGeometry = true);

170170 void updateSectionItem(int modelIndex);

171171 void initializeValuesForEmptyList();

172172

tests/plugins/Dash/listviewwithpageheadersectiontest.cpp+15

@@ -2180,6 +2180,21 @@ private Q_SLOTS:

21802180 verifyItem(2, 480., 390., false, "Agressive", false);

21812181 }

21822182

2183+ void firstItemSectionHeightChange()

2184+ {

2185+ QMetaObject::invokeMethod(model, "removeItems", Q_ARG(QVariant, 1), Q_ARG(QVariant, 5));

2186+ model->setProperty(0, "type", "halfheight");

2187+ verifyItem(0, 50., 170., false, "halfheight", false);

2188+ }

2189+

2190+ void secondItemSectionHeightChange()

2191+ {

2192+ QMetaObject::invokeMethod(model, "removeItems", Q_ARG(QVariant, 2), Q_ARG(QVariant, 4));

2193+ model->setProperty(1, "type", "halfheight");

2194+ verifyItem(0, 50., 190., false, "Agressive", false);

2195+ verifyItem(1, 240., 220., false, "halfheight", false);

2196+ }

2197+

21832198private:

21842199 QQuickView *view;

21852200 ListViewWithPageHeader *lvwph;

tests/plugins/Dash/listviewwithpageheadertestsection.qml+1−1

@@ -99,7 +99,7 @@ Rectangle {

9999 Rectangle {

100100 property alias text: theText.text

101101 color: "green"

102− height: 40

102+ height: section === "" ? 0 : section != "halfheight" ? 40 : 20;

103103 Text { id: theText; font.pixelSize: 34 }

104104 anchors { left: parent.left; right: parent.right }

105105 }