git.iko.soy/unity8
on xenial help sign in
fade out tile info when stacked
commite57efda1934e63c822895161222971af0de9c2a6 authorMichael Zanetti <michael.zanetti@canonical.com> dateWed 1 Apr 2015, 18:31 (12 years ago) parentc4a9918
2 files changed+7−5
compare with xenial
unifiedsplit
qml/Stages/DesktopStage.qml+2−2 qml/Stages/SpreadMaths.qml+5−3
qml/Stages/DesktopStage.qml+2−2
@@ -162,7 +162,6 @@ FocusScope {
162162 angle: spreadMaths.animatedAngle
163163 itemScale: spreadMaths.scale
164164 itemScaleOriginY: appDelegate.height;
165− color: "green"
166165 z: index
167166 }
168167 PropertyChanges {
@@ -175,7 +174,8 @@ FocusScope {
175174 }
176175 PropertyChanges {
177176 target: tileInfo
178− visible: spreadMaths.desktopTitleInfoShown(index, spreadFlickable.contentX)
177+ visible: true
178+ opacity: spreadMaths.tileInfoOpacity
179179 }
180180 }
181181 ]
qml/Stages/SpreadMaths.qml+5−3
@@ -95,9 +95,11 @@ Item {
9595 ) / itemHeight
9696
9797
98− function desktopTitleInfoShown(index, flickableX) {
99− return true;
100− }
98+ readonly property real tileInfoOpacity: leftFoldingAreaProgress > 0 ?
99+ linearAnimation(0, 0.5, 1, 0, leftFoldingAreaProgress)
100+ : rightFoldingAreaProgress > 0 ?
101+ linearAnimation(0 ,0.5, 1, 0, rightFoldingAreaProgress)
102+ : 1
101103
102104 // Helpers
103105 function linearAnimation(startProgress, endProgress, startValue, endValue, progress) {