git.iko.soy/unity8
on xenial help sign in
temporary commit: more tweaks to match design closer
commit098b0df0e1170ad1fa2c987ac6839317676df7e2 authorMichael Zanetti <michael.zanetti@canonical.com> dateWed 21 Aug 2013, 13:00 (13 years ago) parent89677a3
3 files changed+21−8
compare with xenial
unifiedsplit
Launcher/FoldingLauncherDelegate.qml+1−1 Launcher/Launcher.qml+2−2 Launcher/LauncherPanel.qml+18−5
Launcher/FoldingLauncherDelegate.qml+1−1
@@ -63,7 +63,7 @@ LauncherDelegate {
6363
6464 // We stopped folding, move slower than the actual flicking speed.
6565 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;
6767 }
6868 return 0;
6969 }
Launcher/Launcher.qml+2−2
@@ -26,7 +26,7 @@ Item {
2626
2727 property bool available: true // can be used to disable all interactions
2828
29− property int panelWidth: units.gu(8.5)
29+ property int panelWidth: units.gu(8)
3030 property int dragAreaWidth: units.gu(1)
3131 property real progress: dragArea.dragging && dragArea.touchX > panel.width ? dragArea.touchX : 0
3232
@@ -74,7 +74,7 @@ Item {
7474 interval: 5000
7575 onTriggered: {
7676 if (!panel.preventHiding) {
77− root.state = ""
77+// root.state = ""
7878 } else {
7979 dismissTimer.restart()
8080 }
Launcher/LauncherPanel.qml+18−5
@@ -113,11 +113,11 @@ Item {
113113 property int extensionSize: itemHeight * 3
114114
115115 // 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)
117117 // The height of the area where the items reach the final folding angle
118− property int foldingStopHeight: units.gu(0.5)
119− property int itemWidth: width
120− property int itemHeight: width * 7.5 / 8
118+ property int foldingStopHeight: foldingStartHeight - itemHeight - spacing
119+ property int itemWidth: units.gu(7)
120+ property int itemHeight: units.gu(6.5)
121121 property int clickFlickSpeed: units.gu(60)
122122 property int draggedIndex: dndArea.draggedIndex
123123 property real realContentY: contentY - originY + topMargin
@@ -137,7 +137,7 @@ Item {
137137 iconName: model.icon
138138 inverted: root.inverted
139139 z: -Math.abs(offset)
140− maxAngle: 60
140+ maxAngle: 55
141141 property bool dragging: false
142142
143143 ThinDivider {
@@ -220,6 +220,19 @@ Item {
220220 ]
221221 }
222222
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+
223236 MouseArea {
224237 id: dndArea
225238 objectName: "dndArea"