ab9e993 · unity8 · git.iko.soy

git.iko.soy/unity8

Merge

commitab9e993ccda2b8b00bb70681ca2daaf83e0a7def authorAlbert Astals <albert.astals@canonical.com> dateMon 15 Sep 2014, 17:37 (12 years ago) parentabf0815 5024acf

2 files changed+3−2

compare with xenial

unifiedsplit

plugins/Dash/listviewwithpageheader.cpp+1−1 tests/qmltests/Dash/tst_GenericScopeView.qml+2−1

plugins/Dash/listviewwithpageheader.cpp+1−1

@@ -542,7 +542,7 @@ void ListViewWithPageHeader::adjustHeader(qreal diff)

542542 // (but the header was not shown by it's own position)

543543 // or the header is partially shown and we are not doing a maximizeVisibleArea either

544544 const bool scrolledUp = m_previousContentY > contentY();

545− const bool notRebounding = contentY() + height() < contentHeight();

545+ const bool notRebounding = qRound(contentY() + height()) < qRound(contentHeight());

546546 const bool notShownByItsOwn = contentY() + diff >= m_headerItem->y() + m_headerItem->height();

547547 const bool maximizeVisibleAreaRunning = m_contentYAnimation->isRunning() && contentYAnimationType == ContentYAnimationMaximizeVisibleArea;

548548

tests/qmltests/Dash/tst_GenericScopeView.qml+2−1

@@ -100,6 +100,7 @@ Item {

100100 function scrollToEnd()

101101 {

102102 var categoryListView = findChild(genericScopeView, "categoryListView");

103+ waitForRendering(categoryListView);

103104 while (!categoryListView.atYEnd) {

104105 mouseFlick(genericScopeView, genericScopeView.width/2, genericScopeView.height - units.gu(8),

105106 genericScopeView.width/2, genericScopeView.y)

@@ -479,7 +480,7 @@ Item {

479480 verify(category1.expanded);

480481 tryCompare(category1, "height", category1.item.expandedHeight + seeAll1.height);

481482 tryCompareFunction(function() {

482− return genericScopeView.categoryView.contentY + category1.y + category1.height + genericScopeView.categoryView.pageHeader.height

483+ return genericScopeView.categoryView.contentY + category1.y + category1.height

483484 == genericScopeView.categoryView.contentHeight;}

484485 , true);

485486 }