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)
4d201fdMichael Zanetti
qml/Stages/PhoneStage.qml−1
compare with xenial
unifiedsplit
@@ -383,7 +383,6 @@ Item {
383 property: "contentX"
383 property: "contentX"
384 to: snapAnimation.targetContentX
384 to: snapAnimation.targetContentX
385 duration: UbuntuAnimation.FastDuration
385 duration: UbuntuAnimation.FastDuration
386−// duration: UbuntuAnimation.SleepyDuration
387 }
386 }
388
387
389 ScriptAction {
388 ScriptAction {
qml/Stages/TransformedSpreadDelegate.qml+3−2
@@ -102,6 +102,7 @@ SpreadDelegate {
102 selectedScale = scale;
102 selectedScale = scale;
103 selectedOpacity = opacity;
103 selectedOpacity = opacity;
104 selectedTopMarginProgress = topMarginProgress;
104 selectedTopMarginProgress = topMarginProgress;
105+ if (index == 1) print("snapshotting values:", selectedProgress, selectedXTranslate, selectedAngle, selectedScale, selectedOpacity, selectedTopMarginProgress)
105 }
106 }
106
107
107 property real negativeProgress: {
108 property real negativeProgress: {
@@ -233,7 +234,7 @@ SpreadDelegate {
233 }
234 }
234
235
235 property real opacity: {
236 property real opacity: {
236− if (otherSelected) {
237+ if (priv.otherSelected) {
237 return linearAnimation (selectedProgress, Math.max(0, selectedProgress - .5),
238 return linearAnimation (selectedProgress, Math.max(0, selectedProgress - .5),
238 selectedOpacity, 0, root.progress);
239 selectedOpacity, 0, root.progress);
239 }
240 }
@@ -251,7 +252,7 @@ SpreadDelegate {
251 }
252 }
252
253
253 property real topMarginProgress: {
254 property real topMarginProgress: {
254− if (selected) {
255+ if (priv.isSelected) {
255 return linearAnimation(selectedProgress, negativeProgress, selectedTopMarginProgress, 0, root.progress);
256 return linearAnimation(selectedProgress, negativeProgress, selectedTopMarginProgress, 0, root.progress);
256 }
257 }
257
258