@@ -1,43 +1,66 @@
11import QtQuick 2.2
2+import Ubuntu.Components 1.1
23import Utils 0.1
34import Unity.Application 0.1
45
5−QtObject {
6− id: root
6+Item {
77
8− function desktopX(index, totalWidth, flickableX) {
9− var margins = units.gu(5);
10− var distance = (totalWidth - margins * 2) / 5;
11− var foldedDistance = units.gu(0.5)
12− var reverseIndex = ApplicationManager.count - index
13−
14− var x = (index * distance) - flickableX + margins;
15− // limit at left
16− x = Math.max(margins + foldedDistance * index, x);
17− // limit at right
18− x = Math.min(totalWidth - margins - distance - foldedDistance * reverseIndex, x);
19−
20− return x
21−
22−
23− var startProgress = 0;
24− var endProgress = 1;
25− var startValue = index * distance;
26− var endValue = 0;
27− var progress = 1.0 * flickableX / startValue;
28− print("progress for tile", index, ":", startProgress, endProgress, startValue, endValue, progress)
29− var x = easingAnimation(startProgress, endProgress, startValue, endValue, progress);
30− print("resulting x:", x)
31− return x + units.gu(5);
8+ Label {
9+ anchors {left: parent.left; top: parent.top }
10+ text: "prog:" + transitionCurve.progress.toFixed(2)
11+ color: isInLeftFoldingArea ? "red" : "black"
3212 }
3313
14+ id: root
15+ anchors { left: parent.left; top: parent.top; margins: units.gu(1) }
16+
17+ property int itemIndex: 0
18+ property int totalItems: 0
19+ property Item flickable: null
20+ property int margins: units.gu(5)
21+ property int foldingAreaWidth: units.gu(5)
22+
23+ property int maxVisibleItems: 5
24+
25+ readonly property int flickableWidth: flickable ? flickable.width : 0
26+ readonly property int flickableContentWidth: flickable ? flickable.contentWidth: 0
27+ readonly property real flickableProgress: flickable ? flickable.contentX / (flickable.contentWidth - flickableWidth) : 0
28+
29+ readonly property int contentWidth: flickableWidth - root.margins * 2
30+
31+ readonly property int unfoldedDistance: (contentWidth - foldingAreaWidth) / maxVisibleItems
32+
33+ // Internal
34+ readonly property real progressSlice: 1 / totalItems;
35+ readonly property real startProgress: Math.max(0, index - 2) * progressSlice
36+ readonly property real endProgress: (index + 3) * progressSlice
37+
38+ readonly property real startX: index < maxVisibleItems ?
39+ margins + index * unfoldedDistance
40+ : contentWidth - foldingAreaWidth + (startLayout.value * foldingAreaWidth)
41+
42+ readonly property real endX: totalItems - maxVisibleItems < index ?
43+ contentWidth - (totalItems - index) * unfoldedDistance
44+ : margins + foldingAreaWidth - (endLayout.value * foldingAreaWidth)
45+
46+ readonly property int animatedX: transitionCurve.value * (endX - startX) + startX
47+
3448 function desktopY(sceneHeight, itemHeight) {
3549 return sceneHeight - itemHeight - (sceneHeight * 0.2);
3650 }
3751
38− function desktopAngle(index, flickableX) {
39− return 40;
40− }
52+ property int leftEndFoldedAngle: 80
53+ property int rightEndFoldedAngle: 60
54+ property int unfoldedAngle: 30
55+
56+ property bool isInLeftFoldingArea: animatedX < foldingAreaWidth + margins
57+
58+ // x : foldingAreaWidth = leftEndFoldedAngle: unfoldedAngle:
59+
60+ readonly property int animatedAngle: isInLeftFoldingArea ?
61+ ((foldingAreaWidth + margins) - x) * unfoldedAngle / leftEndFoldedAngle
62+ : unfoldedAngle
63+
4164
4265 function desktopScale(sceneHeight, itemHeight) {
4366 var maxHeight = sceneHeight * 0.35;
@@ -47,14 +70,30 @@ QtObject {
4770 return 1;
4871 }
4972
50− function easingAnimation(startProgress, endProgress, startValue, endValue, progress) {
51− easingCurve.progress = progress - startProgress;
52− easingCurve.period = endProgress - startProgress;
53− return easingCurve.value * (endValue - startValue) + startValue;
73+ function desktopTitleInfoShown(index, flickableX) {
74+ return true;
75+ }
76+
77+ EasingCurve {
78+ id: transitionCurve
79+ type: easingCurve.InOutSine
80+
81+ readonly property real normalizedEndProgress: endProgress - startProgress
82+ readonly property real normalizedProgress: (root.flickableProgress - root.startProgress) / normalizedEndProgress
83+ progress: normalizedProgress
84+ }
85+
86+ EasingCurve {
87+ id: startLayout
88+ type: EasingCurve.OutSine
89+ // total : 1 = index : p
90+ progress: 1.0 * index / root.totalItems
5491 }
5592
56− property var easingCurve: EasingCurve {
93+ EasingCurve {
94+ id: endLayout
5795 type: EasingCurve.OutSine
58− period: 1
96+ // total : 1 = index : p
97+ progress: 1 - (1.0 * index / root.totalItems)
5998 }
6099}