git.iko.soy/unity8
on xenial help sign in
convert launcher to be a flickable.
4166f72Michael Zanetti
Launcher/LauncherDelegate.qml+17−19
compare with xenial
unifiedsplit
@@ -67,6 +67,7 @@ Item {
67 onClicked: root.clicked()
67 onClicked: root.clicked()
68 onCanceled: root.released()
68 onCanceled: root.released()
69 preventStealing: false
69 preventStealing: false
70+ enabled: root.angle < 5
70
71
71 onPressAndHold: {
72 onPressAndHold: {
72 root.state = "moving"
73 root.state = "moving"
@@ -153,18 +154,15 @@ Item {
153 QtObject {
154 QtObject {
154 id: priv
155 id: priv
155
156
156− // The height of the area where icons start getting folded
157− property int foldingAreaHeight: totalUnfoldedHeight * 0.75
158−
159− property real totalUnfoldedHeight: launcherFlickable.itemSize + launcherColumn.spacing
157+ property real totalUnfoldedHeight: launcherListView.itemSize + launcherListView.spacing
160− property real totalEffectiveHeight: effectiveHeight + launcherColumn.spacing
158+ property real totalEffectiveHeight: effectiveHeight + launcherListView.spacing
161− property real distanceFromTopEdge: -(launcherFlickable.contentY - itemsBeforeThis*totalUnfoldedHeight)
159+ property real distanceFromTopEdge: -(launcherListView.contentY + launcherListView.topMargin - itemsBeforeThis*totalUnfoldedHeight)
162− property real distanceFromBottomEdge: launcherFlickable.height - (y+height) + launcherFlickable.contentY
160+ property real distanceFromBottomEdge: launcherListView.height - launcherListView.bottomMargin - (y+height) + launcherListView.contentY
163
161
164 property real distanceFromEdge: Math.abs(distanceFromBottomEdge) < Math.abs(distanceFromTopEdge) ? distanceFromBottomEdge : distanceFromTopEdge
162 property real distanceFromEdge: Math.abs(distanceFromBottomEdge) < Math.abs(distanceFromTopEdge) ? distanceFromBottomEdge : distanceFromTopEdge
165 property real orientationFlag: Math.abs(distanceFromBottomEdge) < Math.abs(distanceFromTopEdge) ? -1 : 1
163 property real orientationFlag: Math.abs(distanceFromBottomEdge) < Math.abs(distanceFromTopEdge) ? -1 : 1
166
164
167− property real overlapWithFoldingArea: foldingAreaHeight - distanceFromEdge
165+ property real overlapWithFoldingArea: launcherListView.foldingAreaHeight - distanceFromEdge
168
166
169 }
167 }
170
168
@@ -177,7 +175,7 @@ Item {
177 // This is the offset that keeps the items inside the panel
175 // This is the offset that keeps the items inside the panel
178 offset: {
176 offset: {
179 // First/last items are special
177 // First/last items are special
180− if (index == 0 || index == iconRepeater.count-1) {
178+ if (index == 0 || index == launcherListView.count-1) {
181 // Just keep them bound to the edges in case they're outside of the visible area
179 // Just keep them bound to the edges in case they're outside of the visible area
182 if (priv.distanceFromEdge < 0) {
180 if (priv.distanceFromEdge < 0) {
183 return (-priv.distanceFromEdge - (height - effectiveHeight)) * priv.orientationFlag;
181 return (-priv.distanceFromEdge - (height - effectiveHeight)) * priv.orientationFlag;
@@ -203,10 +201,10 @@ Item {
203 angle: {
201 angle: {
204 //return 0;
202 //return 0;
205 // First item is special
203 // First item is special
206− if (index == 0 || index == iconRepeater.count-1) {
204+ if (index == 0 || index == launcherListView.count-1) {
207 if (priv.distanceFromEdge < 0) {
205 if (priv.distanceFromEdge < 0) {
208 // distanceFromTopEdge : angle = totalUnfoldedHeight/2 : maxAngle
206 // distanceFromTopEdge : angle = totalUnfoldedHeight/2 : maxAngle
209− return Math.max(-maxAngle, priv.distanceFromEdge * maxAngle / (priv.foldingAreaHeight)) * priv.orientationFlag
207+ return Math.max(-maxAngle, priv.distanceFromEdge * maxAngle / (launcherListView.foldingAreaHeight)) * priv.orientationFlag
210 }
208 }
211 return 0; // Don't fold first item as long as inside the view
209 return 0; // Don't fold first item as long as inside the view
212 }
210 }
@@ -214,13 +212,13 @@ Item {
214 // Are we in the already completely outside the flickable? Fold for the last 5 degrees
212 // Are we in the already completely outside the flickable? Fold for the last 5 degrees
215 if (priv.distanceFromEdge < 0) {
213 if (priv.distanceFromEdge < 0) {
216 // -distanceFromTopEdge : angle = totalUnfoldedHeight : 5
214 // -distanceFromTopEdge : angle = totalUnfoldedHeight : 5
217− return Math.max(-maxAngle, (priv.distanceFromEdge * 5 / priv.foldingAreaHeight) - (maxAngle-5)) * priv.orientationFlag
215+ return Math.max(-maxAngle, (priv.distanceFromEdge * 5 / launcherListView.foldingAreaHeight) - (maxAngle-5)) * priv.orientationFlag
218 }
216 }
219
217
220 // We are overlapping with the folding area, fold the icon to maxAngle - 5 degrees
218 // We are overlapping with the folding area, fold the icon to maxAngle - 5 degrees
221 if (priv.overlapWithFoldingArea > 0) {
219 if (priv.overlapWithFoldingArea > 0) {
222 // overlap: totalHeight = angle : (maxAngle - 5)
220 // overlap: totalHeight = angle : (maxAngle - 5)
223− return -priv.overlapWithFoldingArea * (maxAngle -5) / priv.foldingAreaHeight * priv.orientationFlag;
221+ return -priv.overlapWithFoldingArea * (maxAngle -5) / launcherListView.foldingAreaHeight * priv.orientationFlag;
224
222
225 }
223 }
226
224
@@ -229,10 +227,10 @@ Item {
229
227
230 opacity: {
228 opacity: {
231 // First item is special
229 // First item is special
232− if (index == 0 || index == iconRepeater.count-1) {
230+ if (index == 0 || index == launcherListView.count-1) {
233 if (priv.distanceFromEdge < 0) {
231 if (priv.distanceFromEdge < 0) {
234 // Fade from 1 to 0 in the distance of 3 * foldingAreaHeight (which is when the next item reaches the edge)
232 // Fade from 1 to 0 in the distance of 3 * foldingAreaHeight (which is when the next item reaches the edge)
235− return 1.0 - (-priv.distanceFromEdge / (priv.foldingAreaHeight * 3))
233+ return 1.0 - (-priv.distanceFromEdge / (launcherListView.foldingAreaHeight * 3))
236 }
234 }
237 return 1; // Don't make first/last item transparent as long as inside the view
235 return 1; // Don't make first/last item transparent as long as inside the view
238 }
236 }
@@ -246,15 +244,15 @@ Item {
246 // We are overlapping with the folding area, fade out to 0.75
244 // We are overlapping with the folding area, fade out to 0.75
247 if (priv.overlapWithFoldingArea > 0) {
245 if (priv.overlapWithFoldingArea > 0) {
248 // overlap : totalHeight = 1-opacity : 0.25
246 // overlap : totalHeight = 1-opacity : 0.25
249− return 1 - (priv.overlapWithFoldingArea * 0.25 / priv.foldingAreaHeight)
247+ return 1 - (priv.overlapWithFoldingArea * 0.25 / launcherListView.foldingAreaHeight)
250 }
248 }
251 return 1;
249 return 1;
252 }
250 }
253
251
254 brightness: {
252 brightness: {
255− if (index == 0 || index == iconRepeater.count-1) {
253+ if (index == 0 || index == launcherListView.count-1) {
256 if (priv.distanceFromEdge < 0) {
254 if (priv.distanceFromEdge < 0) {
257− return -(-priv.distanceFromEdge / (priv.foldingAreaHeight * 3))
255+ return -(-priv.distanceFromEdge / (launcherListView.foldingAreaHeight * 3))
258 }
256 }
259 return 0;
257 return 0;
260 }
258 }
@@ -263,7 +261,7 @@ Item {
263 }
261 }
264
262
265 if (priv.overlapWithFoldingArea > 0) {
263 if (priv.overlapWithFoldingArea > 0) {
266− return - (priv.overlapWithFoldingArea * 0.3 / priv.foldingAreaHeight)
264+ return - (priv.overlapWithFoldingArea * 0.3 / launcherListView.foldingAreaHeight)
267 }
265 }
268 return 0;
266 return 0;
269 }
267 }
Launcher/LauncherPanel.qml+75−42
@@ -27,7 +27,7 @@ Item {
27 property var model
27 property var model
28 property bool inverted: false
28 property bool inverted: false
29 property bool dragging: false
29 property bool dragging: false
30− property bool moving: launcherFlickable.moving
30+ property bool moving: launcherListView.moving
31 property int dragPosition: 0
31 property int dragPosition: 0
32 property int highlightIndex: -1
32 property int highlightIndex: -1
33
33
@@ -35,23 +35,23 @@ Item {
35 signal dashItemSelected(int index)
35 signal dashItemSelected(int index)
36
36
37 onDragPositionChanged: {
37 onDragPositionChanged: {
38− var effectiveDragPosition = root.inverted ? launcherFlickable.height - dragPosition : dragPosition - mainColumn.anchors.margins
38+ var effectiveDragPosition = root.inverted ? launcherListView.height - dragPosition : dragPosition - mainColumn.anchors.margins
39
39
40− var hiddenContentHeight = launcherFlickable.contentHeight - launcherFlickable.height
40+ var hiddenContentHeight = launcherListView.contentHeight - launcherListView.height
41 // Shortening scrollable height because the first/last item needs to be fully expanded before reaching the top/bottom
41 // Shortening scrollable height because the first/last item needs to be fully expanded before reaching the top/bottom
42− var scrollableHeight = launcherFlickable.height - (launcherFlickable.itemSize + launcherColumn.spacing) *2
42+ var scrollableHeight = launcherListView.height - (launcherListView.itemSize + launcherColumn.spacing) *2
43 // As we shortened the scrollableHeight, lets move everything down by the itemSize
43 // As we shortened the scrollableHeight, lets move everything down by the itemSize
44− var shortenedEffectiveDragPosition = effectiveDragPosition - launcherFlickable.itemSize - launcherColumn.spacing
44+ var shortenedEffectiveDragPosition = effectiveDragPosition - launcherListView.itemSize - launcherColumn.spacing
45 var newContentY = shortenedEffectiveDragPosition * hiddenContentHeight / scrollableHeight
45 var newContentY = shortenedEffectiveDragPosition * hiddenContentHeight / scrollableHeight
46
46
47 // limit top/bottom to prevent overshooting
47 // limit top/bottom to prevent overshooting
48− launcherFlickable.contentY = Math.min(hiddenContentHeight, Math.max(0, newContentY));
48+ launcherListView.contentY = Math.min(hiddenContentHeight, Math.max(0, newContentY));
49
49
50 // Now calculate the current index:
50 // Now calculate the current index:
51 // > the current mouse position + the hidden/scolled content on top is the mouse position in the averall view
51 // > the current mouse position + the hidden/scolled content on top is the mouse position in the averall view
52 // > adjust that removing all the margins
52 // > adjust that removing all the margins
53 // > divide by itemSize to get index
53 // > divide by itemSize to get index
54− highlightIndex = (effectiveDragPosition + launcherFlickable.contentY - mainColumn.anchors.margins*3 - launcherColumn.spacing/2) / (launcherFlickable.itemSize + launcherColumn.spacing)
54+ highlightIndex = (effectiveDragPosition + launcherListView.contentY - mainColumn.anchors.margins*3 - launcherColumn.spacing/2) / (launcherListView.itemSize + launcherColumn.spacing)
55 }
55 }
56
56
57 BorderImage {
57 BorderImage {
@@ -76,6 +76,7 @@ Item {
76 width: parent.width
76 width: parent.width
77 height: units.gu(6.5)
77 height: units.gu(6.5)
78 onClicked: root.dashItemSelected(0)
78 onClicked: root.dashItemSelected(0)
79+ z: 1
79 Image {
80 Image {
80 objectName: "dashItem"
81 objectName: "dashItem"
81 width: units.gu(5.5)
82 width: units.gu(5.5)
@@ -92,46 +93,78 @@ Item {
92 }
93 }
93 }
94 }
94
95
95− Flickable {
96+ Item {
96− id: launcherFlickable
97 anchors.left: parent.left
97 anchors.left: parent.left
98 anchors.right: parent.right
98 anchors.right: parent.right
99 height: parent.height - dashItem.height - parent.spacing*2
99 height: parent.height - dashItem.height - parent.spacing*2
100− contentHeight: launcherColumn.height
100+ ListView {
101−
101+ id: launcherListView
102− property int itemSize: width
102+ anchors.fill: parent
103−
103+ anchors.topMargin: -itemSize
104− Column {
104+ anchors.bottomMargin: -itemSize
105− id: launcherColumn
105+ topMargin: itemSize
106− width: parent.width
106+ bottomMargin: itemSize
107− //spacing: units.gu(1)
107+ height: parent.height - dashItem.height - parent.spacing*2
108− anchors.horizontalCenter: parent.horizontalCenter
108+ model: root.model
109−
109+ cacheBuffer: itemSize * 3
110− Repeater {
110+ snapMode: ListView.SnapToItem
111− id: iconRepeater
111+ highlightRangeMode: ListView.ApplyRange
112− model: root.model
112+ preferredHighlightBegin: (height - itemSize) / 2
113−
113+ preferredHighlightEnd: (height + itemSize) / 2
114+ currentIndex: 0
115+
116+ property int itemSize: width
117+
118+ // The height of the area where icons start getting folded
119+ property int foldingAreaHeight: itemSize * 0.75
120+
121+
114− LauncherDelegate {
122+ delegate: LauncherDelegate {
115− id: launcherDelegate
123+ id: launcherDelegate
116− objectName: "launcherDelegate" + index
124+ objectName: "launcherDelegate" + index
117− width: launcherFlickable.itemSize
125+ width: launcherListView.itemSize
118− height: launcherFlickable.itemSize
126+ height: launcherListView.itemSize
119− iconName: model.icon
127+ iconName: model.icon
120− inverted: root.inverted
128+ inverted: root.inverted
121− highlighted: root.dragging && index === root.highlightIndex
129+ highlighted: root.dragging && index === root.highlightIndex
122− z: -Math.abs(offset)
130+ z: -Math.abs(offset)
123− state: "docked"
131+ state: "docked"
124−
132+
125− maxAngle: 60
133+ maxAngle: 60
126−
134+
127− itemsBeforeThis: index
135+ itemsBeforeThis: index
128− itemsAfterThis: iconRepeater.count - (index+1)
136+ itemsAfterThis: launcherListView.count - (index+1)
129−
137+
130− onClicked: {
138+ onClicked: {
131− root.applicationSelected(launcherModel.get(index).desktopFile);
139+ root.applicationSelected(launcherModel.get(index).desktopFile);
132− }
133 }
140 }
134 }
141 }
142+
143+ MouseArea {
144+ id: topFoldingArea
145+ anchors {
146+ left: parent.left
147+ right: parent.right
148+ top: parent.top
149+ topMargin: launcherListView.topMargin
150+ }
151+ height: launcherListView.itemSize
152+ enabled: launcherListView.contentY > -launcherListView.topMargin
153+ onClicked: launcherListView.flick(0, units.gu(40))
154+ }
155+
156+ MouseArea {
157+ id: bottomFoldingArea
158+ anchors {
159+ left: parent.left
160+ right: parent.right
161+ bottom: parent.bottom
162+ bottomMargin: launcherListView.bottomMargin
163+ }
164+ height: launcherListView.itemSize
165+ enabled: launcherListView.contentHeight - launcherListView.height - launcherListView.contentY > -launcherListView.bottomMargin
166+ onClicked: launcherListView.flick(0, -units.gu(40))
167+ }
135 }
168 }
136 }
169 }
137 }
170 }