git.iko.soy/unity8
on xenial help sign in
Listen to contentItem::widthChanged instead of Flickable::contentWidthChanged

Fixes compatibility with Qt 5.6 Fixes: #1565763 Approved by: Gerry Boland, Timo Jyrinki

commit7da665e2a1d33f50a185130de8d2c10be92aeee0 authorAlbert Astals Cid <albert.astals@canonical.com> dateFri 27 May 2016, 13:53 (10 years ago) parent4e3068caeee88b
2 files changed+6−1
compare with xenial
unifiedsplit
plugins/Dash/listviewwithpageheader.cpp+1−1 tests/plugins/Dash/listviewwithpageheadertest.cpp+5
plugins/Dash/listviewwithpageheader.cpp+1−1
@@ -169,7 +169,7 @@ ListViewWithPageHeader::ListViewWithPageHeader()
169169 m_contentYAnimation->setDuration(200);
170170 m_contentYAnimation->setTargetObject(this);
171171
172− connect(this, &ListViewWithPageHeader::contentWidthChanged, this, &ListViewWithPageHeader::onContentWidthChanged);
172+ connect(contentItem(), &QQuickItem::widthChanged, this, &ListViewWithPageHeader::onContentWidthChanged);
173173 connect(this, &ListViewWithPageHeader::contentHeightChanged, this, &ListViewWithPageHeader::onContentHeightChanged);
174174 connect(this, &ListViewWithPageHeader::heightChanged, this, &ListViewWithPageHeader::onHeightChanged);
175175 connect(m_contentYAnimation, &QQuickNumberAnimation::runningChanged, this, &ListViewWithPageHeader::contentYAnimationRunningChanged);
tests/plugins/Dash/listviewwithpageheadertest.cpp+5
@@ -45,6 +45,11 @@ private:
4545 QTRY_COMPARE(item->y(), pos);
4646 QTRY_COMPARE(item->height(), height);
4747 QCOMPARE(QQuickItemPrivate::get(item->m_item)->culled, culled);
48+ if (lvwph->delegate() == otherDelegate) {
49+ QCOMPARE(item->m_item->width(), lvwph->width());
50+ } else {
51+ QCOMPARE(item->m_item->width(), lvwph->width() - 20);
52+ }
4853 }
4954
5055 void changeContentY(qreal change)