git.iko.soy/unity8
on xenial help sign in
scale tiles down to max 35% of scene height
commit400ef98978a10a10ed959faa74310798323fb14e authorMichael Zanetti <michael.zanetti@canonical.com> dateThu 19 Mar 2015, 13:59 (12 years ago) parent6adda00
3 files changed+3−8
compare with xenial
unifiedsplit
qml/Stages/DesktopStage.qml+1−1 qml/Stages/SpreadMaths.qml+1−6 tests/qmltests/tst_DesktopShell.qml+1−1
qml/Stages/DesktopStage.qml+1−1
@@ -183,7 +183,7 @@ FocusScope {
183183 yScale: itemScale
184184 },
185185 Rotation {
186− origin { x: 0; y: (appDelegate.height / 2) / itemScale }
186+ origin { x: 0; y: (appDelegate.height - (appDelegate.height * itemScale / 2)) }
187187 axis { x: 0; y: 1; z: 0 }
188188 angle: appDelegate.angle
189189 }
qml/Stages/SpreadMaths.qml+1−6
@@ -5,12 +5,7 @@ QtObject {
55 id: root
66
77 function desktopX(index, totalWidth, flickableX) {
8− // Uncomment this to keep linear x movement
9− // return (totalWidth / 5) * index - flickableX;
108 var distance = totalWidth / 5;
11− var minX = 0;
12− var startX = index * distance;
13−
149 var startProgress = 0;
1510 var endProgress = 1;
1611 var startValue = index * distance;
@@ -31,7 +26,7 @@ QtObject {
3126 }
3227
3328 function desktopScale(sceneHeight, itemHeight) {
34− var maxHeight = sceneHeight / 2;
29+ var maxHeight = sceneHeight * 0.35;
3530 if (itemHeight > maxHeight) {
3631 return maxHeight / itemHeight
3732 }
tests/qmltests/tst_DesktopShell.qml+1−1
@@ -128,7 +128,7 @@ Item {
128128
129129 Repeater {
130130 id: apps
131− model: ApplicationManager.availableApplications()
131+ model: ApplicationManager.availableApplications
132132 anchors {
133133 left: parent.left
134134 right: parent.right