cf2219b · unity8 · git.iko.soy

on xenial help sign in

Fix LVWPH test failing on Xenial (Qt 5.5)

cf2219bAlbert Astals Cid11 years ago

plugins/Dash/listviewwithpageheader.cpp+5−1

@@ -1177,7 +1177,7 @@ void ListViewWithPageHeader::headerHeightChanged(qreal newHeaderHeight, qreal ol

1177

1178void ListViewWithPageHeader::adjustMinYExtent()

1179{

1180− if (m_visibleItems.isEmpty()) {

1180+ if (m_visibleItems.isEmpty() || contentHeight() < height()) {

1181 m_minYExtent = 0;

1182 } else {

1183 qreal nonCreatedHeight = 0;

@@ -1359,6 +1359,10 @@ void ListViewWithPageHeader::updatePolish()

1359

1360 m_contentHeightDirty = false;

1361 adjustMinYExtent();

1362+ if (contentHeight < height()) {

1363+ // need this since in the previous call to adjustMinYExtent contentHeight is not set yet

1364+ m_minYExtent = 0;

1365+ }

1362 m_inContentHeightKeepHeaderShown = m_headerItem && m_headerItem->y() == contentY();

1366 m_inContentHeightKeepHeaderShown = m_headerItem && m_headerItem->y() == contentY();

1363 setContentHeight(contentHeight);

1367 setContentHeight(contentHeight);

1364 m_inContentHeightKeepHeaderShown = false;

1368 m_inContentHeightKeepHeaderShown = false;