← Back to branch summary

~mterry/unity8/greeter-misc-cleanups

« back to all changes in this revision

Viewing changes to qml/Stages/TransformedSpreadDelegate.qml

  • Committer: Michael Terry
  • Date: 2014-08-07 15:30:54 UTC
  • mfrom: (1086.1.48 unity8)
  • Revision ID: michael.terry@canonical.com-20140807153054-nqahwmptl0dw9bum
Merge from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
qml/Stages/TransformedSpreadDelegate.qml
46
46
    property real startDistance: units.gu(5)
47
47
    property real endDistance: units.gu(.5)
48
48
 
49
 
    // Hiding tiles when their progress is negative or reached the maximum
50
 
    visible: progress >= 0 && progress < 1.7
51
 
 
52
49
    onSelectedChanged: {
53
50
        if (selected) {
54
51
            priv.snapshot();
132
129
        // the selected tile, which is animated from the snapshotted position to be fullscreen.
133
130
 
134
131
        readonly property real xTranslate: {
 
132
            if (!spreadView.active) {
 
133
                return 0;
 
134
            }
 
135
 
135
136
            if (otherSelected) {
136
137
                if (spreadView.phase < 2 && index == 0) {
137
138
                    return linearAnimation(selectedProgress, 0, selectedXTranslate,
183
184
        }
184
185
 
185
186
        readonly property real angle: {
186
 
            if (spreadView.focusChanging) {
 
187
            if (!spreadView.active) {
187
188
                return 0;
188
189
            }
189
190
 
216
217
        }
217
218
 
218
219
        readonly property real scale: {
219
 
            if (spreadView.focusChanging) {
 
220
            if (!spreadView.active) {
220
221
                return 1;
221
222
            }
222
223
            if (priv.otherSelected) {