on xenial help sign in
small fixes
commit2113423ec3da7d7d0222b86bd9635cb46e0c381e authorMichael Zanetti <michael.zanetti@canonical.com> dateWed 21 Aug 2013, 09:46 (13 years ago) parentf0edcaa
1 file changed+4−4
Launcher/FoldingLauncherDelegate.qml+4−4
Launcher/FoldingLauncherDelegate.qml+4−4
@@ -24,9 +24,9 @@ LauncherDelegate {
2424 angle: {
2525 // First/last items are special
2626 if (index == 0 || index == priv.listView.count-1) {
27− if (priv.overlapWithFoldedArea > 0) {
27+ if (priv.distanceFromEdge < 0) {
2828 // proportion equation: distanceFromTopEdge : angle = totalUnfoldedHeight/2 : maxAngle
29− return Math.max(-maxAngle, priv.distanceFromEdge * maxAngle / (priv.listView.foldingStartHeight)) * priv.orientationFlag
29+ return Math.max(-maxAngle, priv.distanceFromEdge * maxAngle / (priv.foldingAreaHeight)) * priv.orientationFlag
3030 }
3131 return 0; // Don't fold first/last item as long as inside the view
3232 }
@@ -74,7 +74,7 @@ LauncherDelegate {
7474 if (priv.distanceFromEdge < 0) {
7575 // Fade from 1 to 0 while the in 2*foldingAreaHeight
7676 // proportion equation: 0.5 : x = -2*foldingAreaHeight : distance
77− return 1 + (priv.distanceFromEdge) / (priv.foldingAreaHeight*2)
77+ return 1 + (priv.distanceFromEdge / (priv.foldingAreaHeight * 2))
7878 }
7979 return 1; // Don't make first/last item transparent as long as inside the view
8080 }
@@ -82,7 +82,7 @@ LauncherDelegate {
8282 // Did we stop folding? Fade out to 0 in 2*foldingAreaHeight
8383 if (priv.overlapWithFoldedArea > 0) {
8484 // overlap : foldingAreaHeight = opacity : 0.75
85− return 0.75 - (priv.overlapWithFoldedArea * 0.75 / (priv.foldingAreaHeight*2));
85+ return 0.75 - (priv.overlapWithFoldedArea * 0.75 / (priv.foldingAreaHeight * 2));
8686 }
8787
8888 // We are overlapping with the folding area, fade out to 0.75 transparency