git.iko.soy/unity8
on xenial help sign in
fix nasty issue that appeard with Qt 5.2 (was bad code already, just happened to work for 5.0)
commit4d201fdf04d50544c68c04788f9b54062e547f43 authorMichael Zanetti <michael.zanetti@canonical.com> dateWed 19 Mar 2014, 14:27 (13 years ago) parent503fad1
2 files changed+3−3
compare with xenial
unifiedsplit
qml/Stages/PhoneStage.qml−1 qml/Stages/TransformedSpreadDelegate.qml+3−2
qml/Stages/PhoneStage.qml−1
@@ -383,7 +383,6 @@ Item {
383383 property: "contentX"
384384 to: snapAnimation.targetContentX
385385 duration: UbuntuAnimation.FastDuration
386−// duration: UbuntuAnimation.SleepyDuration
387386 }
388387
389388 ScriptAction {
qml/Stages/TransformedSpreadDelegate.qml+3−2
@@ -102,6 +102,7 @@ SpreadDelegate {
102102 selectedScale = scale;
103103 selectedOpacity = opacity;
104104 selectedTopMarginProgress = topMarginProgress;
105+ if (index == 1) print("snapshotting values:", selectedProgress, selectedXTranslate, selectedAngle, selectedScale, selectedOpacity, selectedTopMarginProgress)
105106 }
106107
107108 property real negativeProgress: {
@@ -233,7 +234,7 @@ SpreadDelegate {
233234 }
234235
235236 property real opacity: {
236− if (otherSelected) {
237+ if (priv.otherSelected) {
237238 return linearAnimation (selectedProgress, Math.max(0, selectedProgress - .5),
238239 selectedOpacity, 0, root.progress);
239240 }
@@ -251,7 +252,7 @@ SpreadDelegate {
251252 }
252253
253254 property real topMarginProgress: {
254− if (selected) {
255+ if (priv.isSelected) {
255256 return linearAnimation(selectedProgress, negativeProgress, selectedTopMarginProgress, 0, root.progress);
256257 }
257258