git.iko.soy/unity8
on xenial help sign in
spacing and (C) year
5022896Albert Astals
qml/Dash/GenericScopeView.qml+1−2
compare with xenial
unifiedsplit
@@ -171,10 +171,9 @@ FocusScope {
171 if (baseItem.expandable) {
171 if (baseItem.expandable) {
172 var shouldExpand = baseItem.category === expandedCategoryId;
172 var shouldExpand = baseItem.category === expandedCategoryId;
173 if (shouldExpand != baseItem.expanded) {
173 if (shouldExpand != baseItem.expanded) {
174−
175 var animate = false;
174 var animate = false;
176 if (!subPageLoader.open) {
175 if (!subPageLoader.open) {
177− var animateShrinking = !shouldExpand && baseItem.y + baseItem.item.collapsedHeight + baseItem.seeAllButton.height < categoryView.height;
176+ var animateShrinking = !shouldExpand && baseItem.y + baseItem.item.collapsedHeight + baseItem.seeAllButton.height < categoryView.height;
178 var animateGrowing = shouldExpand && baseItem.y + baseItem.height < categoryView.height;
177 var animateGrowing = shouldExpand && baseItem.y + baseItem.height < categoryView.height;
179 animate = shrinkingAny || animateShrinking || animateGrowing;
178 animate = shrinkingAny || animateShrinking || animateGrowing;
180 }
179 }
tests/qmltests/Dash/tst_GenericScopeView.qml+1−1
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright 2013, 2014 Canonical Ltd.
2+ * Copyright 2014 Canonical Ltd.
3 *
3 *
4 * This program is free software; you can redistribute it and/or modify
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
5 * it under the terms of the GNU General Public License as published by