git.iko.soy/unity8
on xenial help sign in
temporary commit: more tweaks to match design closer
098b0dfMichael Zanetti
Launcher/FoldingLauncherDelegate.qml+1−1
compare with xenial
unifiedsplit
@@ -63,7 +63,7 @@ LauncherDelegate {
63
63
64 // We stopped folding, move slower than the actual flicking speed.
64 // We stopped folding, move slower than the actual flicking speed.
65 if (priv.overlapWithFoldedArea > 0) {
65 if (priv.overlapWithFoldedArea > 0) {
66− return (priv.overlapWithFoldedArea * priv.totalEffectiveHeight / priv.foldingAreaHeight) * priv.orientationFlag;
66+ return (priv.overlapWithFoldedArea * priv.totalEffectiveHeight / (priv.totalUnfoldedHeight + priv.listView.foldingStopHeight)) * priv.orientationFlag;
67 }
67 }
68 return 0;
68 return 0;
69 }
69 }
Launcher/Launcher.qml+2−2
@@ -26,7 +26,7 @@ Item {
26
26
27 property bool available: true // can be used to disable all interactions
27 property bool available: true // can be used to disable all interactions
28
28
29− property int panelWidth: units.gu(8.5)
29+ property int panelWidth: units.gu(8)
30 property int dragAreaWidth: units.gu(1)
30 property int dragAreaWidth: units.gu(1)
31 property real progress: dragArea.dragging && dragArea.touchX > panel.width ? dragArea.touchX : 0
31 property real progress: dragArea.dragging && dragArea.touchX > panel.width ? dragArea.touchX : 0
32
32
@@ -74,7 +74,7 @@ Item {
74 interval: 5000
74 interval: 5000
75 onTriggered: {
75 onTriggered: {
76 if (!panel.preventHiding) {
76 if (!panel.preventHiding) {
77− root.state = ""
77+// root.state = ""
78 } else {
78 } else {
79 dismissTimer.restart()
79 dismissTimer.restart()
80 }
80 }
Launcher/LauncherPanel.qml+18−5
@@ -113,11 +113,11 @@ Item {
113 property int extensionSize: itemHeight * 3
113 property int extensionSize: itemHeight * 3
114
114
115 // The height of the area where icons start getting folded
115 // The height of the area where icons start getting folded
116− property int foldingStartHeight: units.gu(8.5)
116+ property int foldingStartHeight: units.gu(7.5)
117 // The height of the area where the items reach the final folding angle
117 // The height of the area where the items reach the final folding angle
118− property int foldingStopHeight: units.gu(0.5)
118+ property int foldingStopHeight: foldingStartHeight - itemHeight - spacing
119− property int itemWidth: width
119+ property int itemWidth: units.gu(7)
120− property int itemHeight: width * 7.5 / 8
120+ property int itemHeight: units.gu(6.5)
121 property int clickFlickSpeed: units.gu(60)
121 property int clickFlickSpeed: units.gu(60)
122 property int draggedIndex: dndArea.draggedIndex
122 property int draggedIndex: dndArea.draggedIndex
123 property real realContentY: contentY - originY + topMargin
123 property real realContentY: contentY - originY + topMargin
@@ -137,7 +137,7 @@ Item {
137 iconName: model.icon
137 iconName: model.icon
138 inverted: root.inverted
138 inverted: root.inverted
139 z: -Math.abs(offset)
139 z: -Math.abs(offset)
140− maxAngle: 60
140+ maxAngle: 55
141 property bool dragging: false
141 property bool dragging: false
142
142
143 ThinDivider {
143 ThinDivider {
@@ -220,6 +220,19 @@ Item {
220 ]
220 ]
221 }
221 }
222
222
223+ Rectangle {
224+ anchors { left: parent.left; right: parent.right; top: parent.top; topMargin: launcherListView.topMargin + launcherListView.foldingStartHeight }
225+ height: units.dp(1); color: "red";
226+ }
227+ Rectangle {
228+ anchors { left: parent.left; right: parent.right; top: parent.top; topMargin: launcherListView.topMargin + launcherListView.foldingStopHeight }
229+ height: units.dp(1); color: "red";
230+ }
231+ Rectangle {
232+ anchors { left: parent.left; right: parent.right; top: parent.top; topMargin: launcherListView.topMargin + launcherListView.foldingStartHeight - units.gu(4.5)}
233+ height: units.dp(1); color: "red";
234+ }
235+
223 MouseArea {
236 MouseArea {
224 id: dndArea
237 id: dndArea
225 objectName: "dndArea"
238 objectName: "dndArea"