git.iko.soy/unity8
on xenial help sign in
Merge lp:~unity-team/unity8/two_see_more_bugfix
abf0815Michał Sawicz
plugins/Dash/listviewwithpageheader.cpp+2−2
compare with xenial
unifiedsplit
@@ -421,12 +421,12 @@ void ListViewWithPageHeader::showHeader()
421 }
421 }
422}
422}
423
423
424−Q_INVOKABLE int ListViewWithPageHeader::firstCreatedIndex() const
424+int ListViewWithPageHeader::firstCreatedIndex() const
425{
425{
426 return m_firstVisibleIndex;
426 return m_firstVisibleIndex;
427}
427}
428
428
429−Q_INVOKABLE int ListViewWithPageHeader::createdItemCount() const
429+int ListViewWithPageHeader::createdItemCount() const
430{
430{
431 return m_visibleItems.count();
431 return m_visibleItems.count();
432}
432}
qml/Dash/GenericScopeView.qml+3−4
@@ -175,7 +175,7 @@ FocusScope {
175
175
176 var animate = false;
176 var animate = false;
177 if (!subPageLoader.open) {
177 if (!subPageLoader.open) {
178− var animateShrinking = !shouldExpand && baseItem.y + baseItem.item.collapsedHeight + baseItem.seeAll.height < categoryView.height;
178+ var animateShrinking = !shouldExpand && baseItem.y + baseItem.item.collapsedHeight + baseItem.seeAllButton.height < categoryView.height;
179 var animateGrowing = shouldExpand && baseItem.y + baseItem.height < categoryView.height;
179 var animateGrowing = shouldExpand && baseItem.y + baseItem.height < categoryView.height;
180 animate = shrinkingAny || animateShrinking || animateGrowing;
180 animate = shrinkingAny || animateShrinking || animateGrowing;
181 }
181 }
@@ -187,7 +187,7 @@ FocusScope {
187
187
188 if (shouldExpand && !subPageLoader.open) {
188 if (shouldExpand && !subPageLoader.open) {
189 if (!shrinkingAny) {
189 if (!shrinkingAny) {
190− categoryView.maximizeVisibleArea(firstCreated + i, baseItem.item.expandedHeight + baseItem.seeAll.height);
190+ categoryView.maximizeVisibleArea(firstCreated + i, baseItem.item.expandedHeight + baseItem.seeAllButton.height);
191 } else {
191 } else {
192 // If the space that shrkinking is smaller than the one we need to grow we'll call maximizeVisibleArea
192 // If the space that shrkinking is smaller than the one we need to grow we'll call maximizeVisibleArea
193 // after the shrink/grow animation ends
193 // after the shrink/grow animation ends
@@ -224,7 +224,6 @@ FocusScope {
224 readonly property string category: categoryId
224 readonly property string category: categoryId
225 readonly property string headerLink: model.headerLink
225 readonly property string headerLink: model.headerLink
226 readonly property var item: rendererLoader.item
226 readonly property var item: rendererLoader.item
227− readonly property var seeAll: seeAll
228
227
229 function expand(expand, animate) {
228 function expand(expand, animate) {
230 heightBehaviour.enabled = animate;
229 heightBehaviour.enabled = animate;
@@ -276,7 +275,7 @@ FocusScope {
276 for (var i = 0; i < categoryView.createdItemCount(); ++i) {
275 for (var i = 0; i < categoryView.createdItemCount(); ++i) {
277 var baseItem = categoryView.item(firstCreated + i);
276 var baseItem = categoryView.item(firstCreated + i);
278 if (baseItem.category === categoryView.expandedCategoryId) {
277 if (baseItem.category === categoryView.expandedCategoryId) {
279− categoryView.maximizeVisibleArea(firstCreated + i, baseItem.item.expandedHeight + baseItem.seeAll.height);
278+ categoryView.maximizeVisibleArea(firstCreated + i, baseItem.item.expandedHeight + baseItem.seeAllButton.height);
280 break;
279 break;
281 }
280 }
282 }
281 }