1
=== renamed file 'Launcher/LauncherDelegate.qml' => 'Launcher/FoldingLauncherDelegate.qml'
2
--- Launcher/LauncherDelegate.qml	2013-07-02 19:19:46 +0000
3
+++ Launcher/FoldingLauncherDelegate.qml	2013-08-19 11:48:45 +0000
4
@@ -17,149 +17,112 @@
5
17
import QtQuick 2.0
17
import QtQuick 2.0
6
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 0.1
7
19
19
9
20
Item {
20
LauncherDelegate {
10
21
    id: root
21
    id: root
11
22
22
140
23
    property string iconName
23
    // The angle used for rotating
141
24
24
    angle: {
142
25
    property real angle: 0
25
        // First/last items are special
143
26
    property bool highlighted: false
26
        if (index == 0 || index == priv.listView.count-1) {
144
27
    property real offset: 0
27
            if (priv.distanceFromEdge < 0) {
145
28
    property alias brightness: transformEffect.brightness
28
                // proportion equation: distanceFromTopEdge : angle = totalUnfoldedHeight/2 : maxAngle
146
29
    property real itemOpacity: 1
29
                return Math.max(-maxAngle, priv.distanceFromEdge * maxAngle / (priv.listView.foldingAreaHeight)) * priv.orientationFlag
147
30
30
            }
148
31
    property real maxAngle: 0
31
            return 0; // Don't fold first/last item as long as inside the view
149
32
    property bool inverted: false
32
        }
150
33
33
151
34
    readonly property int effectiveHeight: Math.cos(angle * Math.PI / 180) * height
34
        // Are we in the already completely outside the flickable? Fold for the last 5 degrees
152
35
    readonly property real foldedHeight: Math.cos(maxAngle * Math.PI / 180) * height
35
        if (priv.distanceFromEdge < 0) {
153
36
36
            // proportion equation: -distanceFromTopEdge : angle = totalUnfoldedHeight : 5
154
37
    property bool dragging:false
37
            return Math.max(-maxAngle, (priv.distanceFromEdge * 5 / priv.listView.foldingAreaHeight) - (maxAngle-5)) * priv.orientationFlag
155
38
38
        }
156
39
    signal clicked()
39
157
40
    signal longtap()
40
        // We are overlapping with the folding area, fold the icon to maxAngle - 5 degrees
158
41
    signal released()
41
        if (priv.overlapWithFoldingArea > 0) {
159
42
42
            // proportion equation: overlap: totalHeight = angle : (maxAngle - 5)
160
43
    Item {
43
            return -priv.overlapWithFoldingArea * (maxAngle -5) / priv.listView.foldingAreaHeight * priv.orientationFlag;
161
44
        id: iconItem
44
        }
162
45
        width: parent.width
45
        return 0;
163
46
        height: parent.height
46
    }
164
47
        anchors.centerIn: parent
47
165
48
48
    // This is the offset that keeps the items inside the panel
166
49
        UbuntuShape {
49
    offset: {
167
50
            id: iconShape
50
        // First/last items are special
168
51
            anchors.fill: parent
51
        if (index == 0 || index == priv.listView.count-1) {
169
52
            anchors.margins: units.gu(0.5)
52
            // Just keep them bound to the edges in case they're outside of the visible area
170
53
            radius: "medium"
53
            if (priv.distanceFromEdge < 0) {
171
54
54
                return (-priv.distanceFromEdge - (height - effectiveHeight)) * priv.orientationFlag;
172
55
            image: Image {
55
            }
173
56
                id: iconImage
56
            return 0;
174
57
                sourceSize.width: iconShape.width
57
        }
175
58
                sourceSize.height: iconShape.height
58
176
59
                source: "../graphics/applicationIcons/" + root.iconName + ".png"
59
        // Are we already completely outside the flickable? Stop the icon here.
177
60
            }
60
        if (priv.distanceFromEdge < -priv.totalUnfoldedHeight) {
178
61
61
            return (-priv.distanceFromEdge - (root.height - effectiveHeight)) * priv.orientationFlag;
179
62
            MouseArea {
62
        }
180
63
                id: mouseArea
63
181
64
                anchors.fill: parent
64
        // We're touching the edge, move slower than the actual flicking speed.
182
65
                onClicked: root.clicked()
65
        if (priv.distanceFromEdge < 0) {
183
66
                onCanceled: root.released()
66
            return (Math.abs(priv.distanceFromEdge) * priv.totalEffectiveHeight / priv.totalUnfoldedHeight) * priv.orientationFlag
184
67
                preventStealing: false
67
        }
185
68
68
        return 0;
186
69
                onPressAndHold: {
69
    }
187
70
                    root.state = "moving"
70
188
71
                }
71
    itemOpacity: {
189
72
                onReleased: {
72
        // First/last items are special
190
73
                    root.state = "docked"
73
        if (index == 0 || index == priv.listView.count-1) {
191
74
                }
74
            if (priv.distanceFromEdge < 0) {
192
75
            }
75
                // Fade from 1 to 0 in the distance of 3 * foldingAreaHeight (which is when the next item reaches the edge)
193
76
        }
76
                return 1.0 - (-priv.distanceFromEdge / (priv.listView.foldingAreaHeight * 3))
194
77
        BorderImage {
77
            }
195
78
            id: overlayHighlight
78
            return 1; // Don't make first/last item transparent as long as inside the view
196
79
            anchors.centerIn: iconItem
79
        }
197
80
            rotation: inverted ? 180 : 0
80
198
81
            source: isSelected ? "graphics/selected.sci" : "graphics/non-selected.sci"
81
        // Are we already completely outside the flickable? Fade from 0.75 to 0 in 2 items height
199
82
            width: root.width + units.gu(0.5)
82
        if (priv.distanceFromEdge < 0) {
200
83
            height: width
83
            // proportion equation: -distanceFromEdge : 1-opacity = totalUnfoldedHeight : 0.75
201
84
            property bool isSelected: root.highlighted || mouseArea.pressed
84
            return 0.75 - (-priv.distanceFromEdge * 0.75 / (priv.totalUnfoldedHeight*2))
202
85
            onIsSelectedChanged: shaderEffectSource.scheduleUpdate();
85
        }
203
86
        }
86
204
87
    }
87
        // We are overlapping with the folding area, fade out to 0.75
205
88
88
        if (priv.overlapWithFoldingArea > 0) {
206
89
    ShaderEffect {
89
            // proportion equation: overlap : totalHeight = 1-opacity : 0.25
207
90
        id: transformEffect
90
            return 1 - (priv.overlapWithFoldingArea * 0.25 / priv.listView.foldingAreaHeight)
208
91
        anchors.centerIn: parent
91
        }
209
92
        anchors.verticalCenterOffset: root.offset
92
        return 1;
210
93
        width: parent.width
93
    }
211
94
        height: parent.height
94
212
95
        property real itemOpacity: root.itemOpacity
95
    brightness: {
213
96
        property real brightness: 0
96
        // First/last items are special
214
97
        property real angle: root.angle
97
        if (index == 0 || index == priv.listView.count-1) {
215
98
        rotation: root.inverted ? 180 : 0
98
            if (priv.distanceFromEdge < 0) {
216
99
99
                return -(-priv.distanceFromEdge / (priv.listView.foldingAreaHeight * 3))
217
100
100
            }
218
101
        property variant source: ShaderEffectSource {
101
            return 0;
219
102
            id: shaderEffectSource
102
        }
220
103
            sourceItem: iconItem
103
        // Are we already completely outside the flickable? Fade from 0.7 to 0 in 2 items height
221
104
            hideSource: true
104
        if (priv.distanceFromEdge < 0) {
222
105
            live: false
105
            return -0.3 - (-priv.distanceFromEdge * 0.1 / (priv.totalUnfoldedHeight*2))
223
106
        }
106
        }
224
107
107
225
108
        transform: [
108
        // We are overlapping with the folding area, fade out to 0.7
226
109
            // Rotating 3 times at top/bottom because that increases the perspective.
109
        if (priv.overlapWithFoldingArea > 0) {
227
110
            // This is a hack, but as QML does not support real 3D coordinates
110
            return - (priv.overlapWithFoldingArea * 0.3 / priv.listView.foldingAreaHeight)
228
111
            // getting a higher perspective can only be done by a hack. This is the most
111
        }
229
112
            // readable/understandable one I could come up with.
112
        return 0;
102
113
            Rotation {
103
114
                axis { x: 1; y: 0; z: 0 }
104
115
                origin { x: iconItem.width / 2; y: angle > 0 ? 0 : iconItem.height; z: 0 }
105
116
                angle: root.angle * 0.7
106
117
            },
107
118
            Rotation {
108
119
                axis { x: 1; y: 0; z: 0 }
109
120
                origin { x: iconItem.width / 2; y: angle > 0 ? 0 : iconItem.height; z: 0 }
110
121
                angle: root.angle * 0.7
111
122
            },
112
123
            Rotation {
113
124
                axis { x: 1; y: 0; z: 0 }
114
125
                origin { x: iconItem.width / 2; y: angle > 0 ? 0 : iconItem.height; z: 0 }
115
126
                angle: root.angle * 0.7
116
127
            },
117
128
            // Because rotating it 3 times moves it more to the front/back, i.e. it gets
118
129
            // bigger/smaller and we need a scale to compensate that again.
119
130
            Scale {
120
131
                xScale: 1 - (Math.abs(angle) / 500)
121
132
                yScale: 1 - (Math.abs(angle) / 500)
122
133
                origin { x: iconItem.width / 2; y: iconItem.height / 2}
123
134
            }
124
135
        ]
125
136
126
137
        // Using a fragment shader instead of QML's opacity and BrightnessContrast
127
138
        // to be able to do both in one step which gives quite some better performance
128
139
        fragmentShader: "
129
140
            varying highp vec2 qt_TexCoord0;
130
141
            uniform sampler2D source;
131
142
            uniform lowp float brightness;
132
143
            uniform lowp float itemOpacity;
133
144
            void main(void)
134
145
            {
135
146
                highp vec4 sourceColor = texture2D(source, qt_TexCoord0);
136
147
                sourceColor.rgb = mix(sourceColor.rgb, vec3(step(0.0, brightness)), abs(brightness));
137
148
                sourceColor *= itemOpacity;
138
149
                gl_FragColor = sourceColor;
139
150
            }"
230
151
    }
113
    }
231
152
114
232
153
    QtObject {
115
    QtObject {
233
154
        id: priv
116
        id: priv
234
155
117
235
156
        property ListView listView: root.ListView.view
118
        property ListView listView: root.ListView.view
237
157
        property real totalUnfoldedHeight: listView.itemSize + listView.spacing
119
        property real totalUnfoldedHeight: listView.itemHeight + listView.spacing
238
158
        property real totalEffectiveHeight: effectiveHeight + listView.spacing
120
        property real totalEffectiveHeight: effectiveHeight + listView.spacing
239
159
        property real effectiveContentY: listView.contentY - listView.originY
121
        property real effectiveContentY: listView.contentY - listView.originY
240
160
        property real effectiveY: y - listView.originY
122
        property real effectiveY: y - listView.originY
241
123
        property real bottomDraggingDistanceOffset: listView.draggedIndex > index ? totalUnfoldedHeight : 0
242
161
        property real distanceFromTopEdge: -(effectiveContentY + listView.topMargin - index*totalUnfoldedHeight)
124
        property real distanceFromTopEdge: -(effectiveContentY + listView.topMargin - index*totalUnfoldedHeight)
244
162
        property real distanceFromBottomEdge: listView.height - listView.bottomMargin - (effectiveY+height) + effectiveContentY
125
        property real distanceFromBottomEdge: listView.height - listView.bottomMargin - (effectiveY+height) + effectiveContentY + bottomDraggingDistanceOffset
245
163
126
246
164
        property real distanceFromEdge: Math.abs(distanceFromBottomEdge) < Math.abs(distanceFromTopEdge) ? distanceFromBottomEdge : distanceFromTopEdge
127
        property real distanceFromEdge: Math.abs(distanceFromBottomEdge) < Math.abs(distanceFromTopEdge) ? distanceFromBottomEdge : distanceFromTopEdge
247
165
        property real orientationFlag: Math.abs(distanceFromBottomEdge) < Math.abs(distanceFromTopEdge) ? -1 : 1
128
        property real orientationFlag: Math.abs(distanceFromBottomEdge) < Math.abs(distanceFromTopEdge) ? -1 : 1
248
@@ -167,123 +130,4 @@
249
167
        property real overlapWithFoldingArea: listView.foldingAreaHeight - distanceFromEdge
130
        property real overlapWithFoldingArea: listView.foldingAreaHeight - distanceFromEdge
250
168
    }
131
    }
251
169
132
252
170
    states: [
253
171
        State {
254
172
            name: "docked"
255
173
            PropertyChanges {
256
174
                target: root
257
175
258
176
                // This is the offset that keeps the items inside the panel
259
177
                offset: {
260
178
                    // First/last items are special
261
179
                    if (index == 0 || index == priv.listView.count-1) {
262
180
                        // Just keep them bound to the edges in case they're outside of the visible area
263
181
                        if (priv.distanceFromEdge < 0) {
264
182
                            return (-priv.distanceFromEdge - (height - effectiveHeight)) * priv.orientationFlag;
265
183
                        }
266
184
                        return 0;
267
185
                    }
268
186
269
187
                    // Are we already completely outside the flickable? Stop the icon here.
270
188
                    if (priv.distanceFromEdge < -priv.totalUnfoldedHeight) {
271
189
                        return (-priv.distanceFromEdge - (root.height - effectiveHeight)) * priv.orientationFlag;
272
190
                    }
273
191
274
192
                    // We're touching the edge, move slower than the actual flicking speed.
275
193
                    if (priv.distanceFromEdge < 0) {
276
194
                        return (Math.abs(priv.distanceFromEdge) * priv.totalEffectiveHeight / priv.totalUnfoldedHeight) * priv.orientationFlag
277
195
                    }
278
196
                    return 0;
279
197
                }
280
198
281
199
                // The angle used for rotating
282
200
                angle: {
283
201
                    // First/last items are special
284
202
                    if (index == 0 || index == priv.listView.count-1) {
285
203
                        if (priv.distanceFromEdge < 0) {
286
204
                            // proportion equation: distanceFromTopEdge : angle = totalUnfoldedHeight/2 : maxAngle
287
205
                            return Math.max(-maxAngle, priv.distanceFromEdge * maxAngle / (priv.listView.foldingAreaHeight)) * priv.orientationFlag
288
206
                        }
289
207
                        return 0; // Don't fold first/last item as long as inside the view
290
208
                    }
291
209
292
210
                    // Are we in the already completely outside the flickable? Fold for the last 5 degrees
293
211
                    if (priv.distanceFromEdge < 0) {
294
212
                        // proportion equation: -distanceFromTopEdge : angle = totalUnfoldedHeight : 5
295
213
                        return Math.max(-maxAngle, (priv.distanceFromEdge * 5 / priv.listView.foldingAreaHeight) - (maxAngle-5)) * priv.orientationFlag
296
214
                    }
297
215
298
216
                    // We are overlapping with the folding area, fold the icon to maxAngle - 5 degrees
299
217
                    if (priv.overlapWithFoldingArea > 0) {
300
218
                        // proportion equation: overlap: totalHeight = angle : (maxAngle - 5)
301
219
                        return -priv.overlapWithFoldingArea * (maxAngle -5) / priv.listView.foldingAreaHeight * priv.orientationFlag;
302
220
                    }
303
221
                    return 0;
304
222
                }
305
223
306
224
                itemOpacity: {
307
225
                    // First/last items are special
308
226
                    if (index == 0 || index == priv.listView.count-1) {
309
227
                        if (priv.distanceFromEdge < 0) {
310
228
                            // Fade from 1 to 0 in the distance of 3 * foldingAreaHeight (which is when the next item reaches the edge)
311
229
                            return 1.0 - (-priv.distanceFromEdge / (priv.listView.foldingAreaHeight * 3))
312
230
                        }
313
231
                        return 1; // Don't make first/last item transparent as long as inside the view
314
232
                    }
315
233
316
234
                    // Are we already completely outside the flickable? Fade from 0.75 to 0 in 2 items height
317
235
                    if (priv.distanceFromEdge < 0) {
318
236
                        // proportion equation: -distanceFromEdge : 1-opacity = totalUnfoldedHeight : 0.75
319
237
                        return 0.75 - (-priv.distanceFromEdge * 0.75 / (priv.totalUnfoldedHeight*2))
320
238
                    }
321
239
322
240
                    // We are overlapping with the folding area, fade out to 0.75
323
241
                    if (priv.overlapWithFoldingArea > 0) {
324
242
                        // proportion equation: overlap : totalHeight = 1-opacity : 0.25
325
243
                        return 1 - (priv.overlapWithFoldingArea * 0.25 / priv.listView.foldingAreaHeight)
326
244
                    }
327
245
                    return 1;
328
246
                }
329
247
330
248
                brightness: {
331
249
                    // First/last items are special
332
250
                    if (index == 0 || index == priv.listView.count-1) {
333
251
                        if (priv.distanceFromEdge < 0) {
334
252
                            return -(-priv.distanceFromEdge / (priv.listView.foldingAreaHeight * 3))
335
253
                        }
336
254
                        return 0;
337
255
                    }
338
256
                    // Are we already completely outside the flickable? Fade from 0.7 to 0 in 2 items height
339
257
                    if (priv.distanceFromEdge < 0) {
340
258
                        return -0.3 - (-priv.distanceFromEdge * 0.1 / (priv.totalUnfoldedHeight*2))
341
259
                    }
342
260
343
261
                    // We are overlapping with the folding area, fade out to 0.7
344
262
                    if (priv.overlapWithFoldingArea > 0) {
345
263
                        return - (priv.overlapWithFoldingArea * 0.3 / priv.listView.foldingAreaHeight)
346
264
                    }
347
265
                    return 0;
348
266
                }
349
267
            }
350
268
        },
351
269
352
270
        State {
353
271
            name: "moving"
354
272
            PropertyChanges {
355
273
                target: launcherDelegate;
356
274
                offset: 0
357
275
                angle: 0
358
276
            }
359
277
            PropertyChanges {
360
278
                target: root
361
279
                highlighted: true
362
280
                dragging: true
363
281
            }
364
282
            PropertyChanges {
365
283
                target: mouseArea
366
284
                preventStealing: true
367
285
                drag.target: root
368
286
            }
369
287
        }
370
288
    ]
371
289
}
133
}
372
290
134
373
=== modified file 'Launcher/Launcher.qml'
374
--- Launcher/Launcher.qml	2013-07-05 11:34:14 +0000
375
+++ Launcher/Launcher.qml	2013-08-19 11:48:45 +0000
376
@@ -135,9 +135,9 @@
377
135
        id: backgroundShade
135
        id: backgroundShade
378
136
        anchors.fill: parent
136
        anchors.fill: parent
379
137
        color: "black"
137
        color: "black"
381
138
        opacity: root.state == "visible" ? 0.4 : 0
138
        opacity: root.state == "visible" ? 0.6 : 0
382
139
139
384
140
        Behavior on opacity { NumberAnimation { duration: 200; easing.type: Easing.OutQuad} }
140
        Behavior on opacity { NumberAnimation { duration: UbuntuAnimation.BriskDuration } }
385
141
    }
141
    }
386
142
142
387
143
    LauncherPanel {
143
    LauncherPanel {
388
144
144
389
=== added file 'Launcher/LauncherDelegate.qml'
390
--- Launcher/LauncherDelegate.qml	1970-01-01 00:00:00 +0000
391
+++ Launcher/LauncherDelegate.qml	2013-08-19 11:48:45 +0000
392
@@ -0,0 +1,137 @@
393
1
/*
394
2
 * Copyright (C) 2013 Canonical, Ltd.
395
3
 *
396
4
 * This program is free software; you can redistribute it and/or modify
397
5
 * it under the terms of the GNU General Public License as published by
398
6
 * the Free Software Foundation; version 3.
399
7
 *
400
8
 * This program is distributed in the hope that it will be useful,
401
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
402
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
403
11
 * GNU General Public License for more details.
404
12
 *
405
13
 * You should have received a copy of the GNU General Public License
406
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
407
15
 */
408
16
409
17
import QtQuick 2.0
410
18
import Ubuntu.Components 0.1
411
19
412
20
Item {
413
21
    id: root
414
22
415
23
    property string iconName
416
24
417
25
    property bool highlighted: false
418
26
    property real maxAngle: 0
419
27
    property bool inverted: false
420
28
421
29
    readonly property int effectiveHeight: Math.cos(angle * Math.PI / 180) * itemHeight
422
30
    readonly property real foldedHeight: Math.cos(maxAngle * Math.PI / 180) * itemHeight
423
31
424
32
    property int itemWidth
425
33
    property int itemHeight
426
34
    // The angle used for rotating
427
35
    property real angle: 0
428
36
    // This is the offset that keeps the items inside the panel
429
37
    property real offset: 0
430
38
    property real itemOpacity: 1
431
39
    property real brightness: 0
432
40
433
41
    Item {
434
42
        id: iconItem
435
43
        width: parent.itemWidth
436
44
        height: parent.itemHeight
437
45
        anchors.centerIn: parent
438
46
439
47
        UbuntuShape {
440
48
            id: iconShape
441
49
            anchors.fill: parent
442
50
            anchors.margins: units.gu(0.5)
443
51
            radius: "medium"
444
52
445
53
            image: Image {
446
54
                id: iconImage
447
55
                sourceSize.width: iconShape.width
448
56
                sourceSize.height: iconShape.height
449
57
                source: "../graphics/applicationIcons/" + iconName + ".png"
450
58
                property string iconName: root.iconName
451
59
                onIconNameChanged: shaderEffectSource.scheduleUpdate();
452
60
            }
453
61
        }
454
62
455
63
        BorderImage {
456
64
            id: overlayHighlight
457
65
            anchors.centerIn: iconItem
458
66
            rotation: inverted ? 180 : 0
459
67
            source: isSelected ? "graphics/selected.sci" : "graphics/non-selected.sci"
460
68
            width: root.itemWidth + units.gu(0.5)
461
69
            height: root.itemHeight + units.gu(0.5)
462
70
            property bool isSelected: root.highlighted
463
71
            onIsSelectedChanged: shaderEffectSource.scheduleUpdate();
464
72
        }
465
73
    }
466
74
467
75
    ShaderEffect {
468
76
        id: transformEffect
469
77
        anchors.centerIn: parent
470
78
        anchors.verticalCenterOffset: root.offset
471
79
        width: parent.itemWidth
472
80
        height: parent.itemHeight
473
81
        property real itemOpacity: root.itemOpacity
474
82
        property real brightness: Math.max(-1, root.brightness)
475
83
        property real angle: root.angle
476
84
        rotation: root.inverted ? 180 : 0
477
85
478
86
        property variant source: ShaderEffectSource {
479
87
            id: shaderEffectSource
480
88
            sourceItem: iconItem
481
89
            hideSource: true
482
90
            live: false
483
91
        }
484
92
485
93
        transform: [
486
94
            // Rotating 3 times at top/bottom because that increases the perspective.
487
95
            // This is a hack, but as QML does not support real 3D coordinates
488
96
            // getting a higher perspective can only be done by a hack. This is the most
489
97
            // readable/understandable one I could come up with.
490
98
            Rotation {
491
99
                axis { x: 1; y: 0; z: 0 }
492
100
                origin { x: iconItem.width / 2; y: angle > 0 ? 0 : iconItem.height; z: 0 }
493
101
                angle: root.angle * 0.7
494
102
            },
495
103
            Rotation {
496
104
                axis { x: 1; y: 0; z: 0 }
497
105
                origin { x: iconItem.width / 2; y: angle > 0 ? 0 : iconItem.height; z: 0 }
498
106
                angle: root.angle * 0.7
499
107
            },
500
108
            Rotation {
501
109
                axis { x: 1; y: 0; z: 0 }
502
110
                origin { x: iconItem.width / 2; y: angle > 0 ? 0 : iconItem.height; z: 0 }
503
111
                angle: root.angle * 0.7
504
112
            },
505
113
            // Because rotating it 3 times moves it more to the front/back, i.e. it gets
506
114
            // bigger/smaller and we need a scale to compensate that again.
507
115
            Scale {
508
116
                xScale: 1 - (Math.abs(angle) / 500)
509
117
                yScale: 1 - (Math.abs(angle) / 500)
510
118
                origin { x: iconItem.width / 2; y: iconItem.height / 2}
511
119
            }
512
120
        ]
513
121
514
122
        // Using a fragment shader instead of QML's opacity and BrightnessContrast
515
123
        // to be able to do both in one step which gives quite some better performance
516
124
        fragmentShader: "
517
125
            varying highp vec2 qt_TexCoord0;
518
126
            uniform sampler2D source;
519
127
            uniform lowp float brightness;
520
128
            uniform lowp float itemOpacity;
521
129
            void main(void)
522
130
            {
523
131
                highp vec4 sourceColor = texture2D(source, qt_TexCoord0);
524
132
                sourceColor.rgb = mix(sourceColor.rgb, vec3(step(0.0, brightness)), abs(brightness));
525
133
                sourceColor *= itemOpacity;
526
134
                gl_FragColor = sourceColor;
527
135
            }"
528
136
    }
529
137
}
530
0
138
531
=== modified file 'Launcher/LauncherPanel.qml'
532
--- Launcher/LauncherPanel.qml	2013-07-11 08:19:10 +0000
533
+++ Launcher/LauncherPanel.qml	2013-08-19 11:48:45 +0000
534
@@ -16,6 +16,7 @@
535
16
16
536
17
import QtQuick 2.0
17
import QtQuick 2.0
537
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 0.1
538
19
import Ubuntu.Components.ListItems 0.1 as ListItems
539
19
import Unity 0.1
20
import Unity 0.1
540
20
import Unity.Launcher 0.1
21
import Unity.Launcher 0.1
541
21
import "../Components/ListItems"
22
import "../Components/ListItems"
542
@@ -28,54 +29,33 @@
543
28
    property var model
29
    property var model
544
29
    property bool inverted: true
30
    property bool inverted: true
545
30
    property bool dragging: false
31
    property bool dragging: false
548
31
    property bool moving: launcherListView.moving || launcherListView.flicking
32
    property bool moving: launcherListView.moving || launcherListView.flicking || dndArea.draggedIndex >= 0
547
32
    property int dragPosition: 0
549
33
    property int highlightIndex: -1
33
    property int highlightIndex: -1
550
34
34
551
35
    signal applicationSelected(string desktopFile)
35
    signal applicationSelected(string desktopFile)
552
36
    signal dashItemSelected(int index)
36
    signal dashItemSelected(int index)
553
37
37
554
38
    onDragPositionChanged: {
555
39
        var effectiveDragPosition = root.inverted ? launcherListView.height - dragPosition : dragPosition - mainColumn.anchors.margins
556
40
557
41
        var hiddenContentHeight = launcherListView.contentHeight - launcherListView.height
558
42
        // Shortening scrollable height because the first/last item needs to be fully expanded before reaching the top/bottom
559
43
        var scrollableHeight = launcherListView.height - (launcherListView.itemSize + launcherColumn.spacing) *2
560
44
        // As we shortened the scrollableHeight, lets move everything down by the itemSize
561
45
        var shortenedEffectiveDragPosition = effectiveDragPosition - launcherListView.itemSize - launcherColumn.spacing
562
46
        var newContentY = shortenedEffectiveDragPosition * hiddenContentHeight / scrollableHeight
563
47
564
48
        // limit top/bottom to prevent overshooting
565
49
        launcherListView.contentY = Math.min(hiddenContentHeight, Math.max(0, newContentY));
566
50
567
51
        // Now calculate the current index:
568
52
        // > the current mouse position + the hidden/scolled content on top is the mouse position in the averall view
569
53
        // > adjust that removing all the margins
570
54
        // > divide by itemSize to get index
571
55
        highlightIndex = (effectiveDragPosition + launcherListView.contentY - mainColumn.anchors.margins*3 - launcherColumn.spacing/2) / (launcherListView.itemSize + launcherColumn.spacing)
572
56
    }
573
57
574
58
    BorderImage {
38
    BorderImage {
575
59
        id: background
39
        id: background
576
60
        source: "graphics/launcher_bg.sci"
40
        source: "graphics/launcher_bg.sci"
577
61
        anchors.fill: parent
41
        anchors.fill: parent
578
42
        anchors.rightMargin: root.inverted ? 0 : -units.gu(1)
579
43
        anchors.leftMargin: root.inverted ? -units.gu(1) : 0
580
44
        rotation: root.rotation
581
62
    }
45
    }
582
63
46
583
64
    Column {
47
    Column {
584
65
        id: mainColumn
48
        id: mainColumn
585
66
        anchors {
49
        anchors {
586
67
            fill: parent
50
            fill: parent
587
68
            topMargin: units.gu(0.5)
588
69
            bottomMargin: units.gu(1)
589
70
            leftMargin: units.gu(0.5)
51
            leftMargin: units.gu(0.5)
590
71
            rightMargin: units.gu(0.5)
52
            rightMargin: units.gu(0.5)
591
72
        }
53
        }
592
73
        spacing: units.gu(0.5)
593
74
54
594
75
        MouseArea {
55
        MouseArea {
595
76
            id: dashItem
56
            id: dashItem
596
77
            width: parent.width
57
            width: parent.width
598
78
            height: units.gu(6.5)
58
            height: units.gu(7)
599
79
            onClicked: root.dashItemSelected(0)
59
            onClicked: root.dashItemSelected(0)
600
80
            z: 1
60
            z: 1
601
81
            Image {
61
            Image {
602
@@ -100,87 +80,336 @@
603
100
            anchors.left: parent.left
80
            anchors.left: parent.left
604
101
            anchors.right: parent.right
81
            anchors.right: parent.right
605
102
            height: parent.height - dashItem.height - parent.spacing*2
82
            height: parent.height - dashItem.height - parent.spacing*2
609
103
            ListView {
83
610
104
                id: launcherListView
84
            Item {
608
105
                objectName: "launcherListView"
611
106
                anchors.fill: parent
85
                anchors.fill: parent
645
107
                anchors.topMargin: -itemSize
86
                clip: true
646
108
                anchors.bottomMargin: -itemSize
87
647
109
                topMargin: itemSize
88
                ListView {
648
110
                bottomMargin: itemSize
89
                    id: launcherListView
649
111
                height: parent.height - dashItem.height - parent.spacing*2
90
                    objectName: "launcherListView"
650
112
                model: root.model
91
                    anchors {
651
113
                cacheBuffer: itemSize * 3
92
                        fill: parent
652
114
                snapMode: ListView.SnapToItem
93
                        topMargin: -extensionSize + units.gu(0.5)
653
115
                highlightRangeMode: ListView.ApplyRange
94
                        bottomMargin: -extensionSize + units.gu(1)
654
116
                preferredHighlightBegin: (height - itemSize) / 2
95
                    }
655
117
                preferredHighlightEnd: (height + itemSize) / 2
96
                    topMargin: extensionSize
656
118
97
                    bottomMargin: extensionSize
657
119
                // The height of the area where icons start getting folded
98
                    height: parent.height - dashItem.height - parent.spacing*2
658
120
                property int foldingAreaHeight: itemSize * 0.75
99
                    model: root.model
659
121
                property int itemSize: width
100
                    cacheBuffer: itemHeight * 3
660
122
                property int clickFlickSpeed: units.gu(60)
101
                    snapMode: interactive ? ListView.SnapToItem : ListView.NoSnap
661
123
102
                    highlightRangeMode: ListView.ApplyRange
662
124
                delegate: LauncherDelegate {
103
                    preferredHighlightBegin: (height - itemHeight) / 2
663
125
                    id: launcherDelegate
104
                    preferredHighlightEnd: (height + itemHeight) / 2
664
126
                    objectName: "launcherDelegate" + index
105
                    spacing: units.gu(0.5)
665
127
                    width: launcherListView.itemSize
106
666
128
                    height: launcherListView.itemSize
107
                    // The size of the area the ListView is extended to make sure items are not
667
129
                    iconName: model.icon
108
                    // destroyed when dragging them outside the list. This needs to be at least
668
130
                    inverted: root.inverted
109
                    // itemHeight to prevent folded items from disappearing and DragArea limits
669
131
                    highlighted: root.dragging && index === root.highlightIndex
110
                    // need to be smaller than this size to avoid breakage.
670
132
                    z: -Math.abs(offset)
111
                    property int extensionSize: itemHeight * 3
671
133
                    state: "docked"
112
672
134
                    maxAngle: 60
113
                    // The height of the area where icons start getting folded
673
135
114
                    property int foldingAreaHeight: itemHeight * 0.75
674
136
                    onClicked: {
115
                    property int itemWidth: width
675
137
                        // First/last item do the scrolling at more than 12 degrees
116
                    property int itemHeight: width * 7.5 / 8
676
138
                        if (index == 0 || index == launcherListView.count -1) {
117
                    property int clickFlickSpeed: units.gu(60)
677
139
                            if (angle > 12) {
118
                    property int draggedIndex: dndArea.draggedIndex
678
119
                    property real realContentY: contentY - originY + topMargin
679
120
                    property int realItemHeight: itemHeight + spacing
680
121
681
122
                    displaced: Transition {
682
123
                        NumberAnimation { properties: "x,y"; duration: UbuntuAnimation.FastDuration; easing: UbuntuAnimation.StandardEasing }
683
124
                    }
684
125
685
126
                    delegate: FoldingLauncherDelegate {
686
127
                        id: launcherDelegate
687
128
                        objectName: "launcherDelegate" + index
688
129
                        itemHeight: launcherListView.itemHeight
689
130
                        itemWidth: launcherListView.itemWidth
690
131
                        width: itemWidth
691
132
                        height: itemHeight
692
133
                        iconName: model.icon
693
134
                        inverted: root.inverted
694
135
                        highlighted: dragging && index === root.highlightIndex
695
136
                        z: -Math.abs(offset)
696
137
                        maxAngle: 60
697
138
                        property bool dragging: false
698
139
699
140
                        ThinDivider {
700
141
                            id: dropIndicator
701
142
                            objectName: "dropIndicator"
702
143
                            anchors.centerIn: parent
703
144
                            width: parent.width + mainColumn.anchors.leftMargin + mainColumn.anchors.rightMargin
704
145
                            opacity: 0
705
146
                        }
706
147
707
148
                        states: [
708
149
                            State {
709
150
                                name: "selected"
710
151
                                when: dndArea.selectedItem === launcherDelegate && fakeDragItem.visible && !dragging
711
152
                                PropertyChanges {
712
153
                                    target: launcherDelegate
713
154
                                    itemOpacity: 0
714
155
                                }
715
156
                            },
716
157
                            State {
717
158
                                name: "dragging"
718
159
                                when: dragging
719
160
                                PropertyChanges {
720
161
                                    target: launcherDelegate
721
162
                                    height: units.gu(1)
722
163
                                    itemOpacity: 0
723
164
                                }
724
165
                                PropertyChanges {
725
166
                                    target: dropIndicator
726
167
                                    opacity: 1
727
168
                                }
728
169
                            },
729
170
                            State {
730
171
                                name: "expanded"
731
172
                                when: dndArea.draggedIndex >= 0 && (dndArea.preDragging || dndArea.dragging || dndArea.postDragging) && dndArea.draggedIndex != index
732
173
                                PropertyChanges {
733
174
                                    target: launcherDelegate
734
175
                                    angle: 0
735
176
                                    offset: 0
736
177
                                    itemOpacity: 0.6
737
178
                                }
738
179
                            }
739
180
                        ]
740
181
741
182
                        transitions: [
742
183
                            Transition {
743
184
                                from: ""
744
185
                                to: "selected"
745
186
                                NumberAnimation { properties: "itemOpacity"; duration: UbuntuAnimation.FastDuration }
746
187
                            },
747
188
                            Transition {
748
189
                                from: "*"
749
190
                                to: "expanded"
750
191
                                NumberAnimation { properties: "itemOpacity"; duration: UbuntuAnimation.FastDuration }
751
192
                                UbuntuNumberAnimation { properties: "angle,offset" }
752
193
                            },
753
194
                            Transition {
754
195
                                from: "expanded"
755
196
                                to: ""
756
197
                                NumberAnimation { properties: "itemOpacity"; duration: UbuntuAnimation.BriskDuration }
757
198
                                UbuntuNumberAnimation { properties: "angle,offset" }
758
199
                            },
759
200
                            Transition {
760
201
                                from: "selected"
761
202
                                to: "dragging"
762
203
                                UbuntuNumberAnimation { properties: "height" }
763
204
                                NumberAnimation { target: dropIndicator; properties: "opacity"; duration: UbuntuAnimation.FastDuration }
764
205
                            },
765
206
                            Transition {
766
207
                                from: "dragging"
767
208
                                to: "*"
768
209
                                NumberAnimation { target: dropIndicator; properties: "opacity"; duration: UbuntuAnimation.FastDuration }
769
210
                                NumberAnimation { properties: "itemOpacity"; duration: UbuntuAnimation.BriskDuration }
770
211
                                SequentialAnimation {
771
212
                                    UbuntuNumberAnimation { properties: "height" }
772
213
                                    PropertyAction { target: dndArea; property: "postDragging"; value: false }
773
214
                                    PropertyAction { target: dndArea; property: "draggedIndex"; value: -1 }
774
215
                                }
775
216
                            }
776
217
                        ]
777
218
                    }
778
219
779
220
                    MouseArea {
780
221
                        id: dndArea
781
222
                        anchors {
782
223
                            fill: parent
783
224
                            topMargin: launcherListView.topMargin
784
225
                            bottomMargin: launcherListView.bottomMargin
785
226
                        }
786
227
                        drag.minimumY: -launcherListView.topMargin
787
228
                        drag.maximumY: height + launcherListView.bottomMargin
788
229
789
230
                        property int draggedIndex: -1
790
231
                        property var selectedItem
791
232
                        property bool preDragging: false
792
233
                        property bool dragging: selectedItem !== undefined && selectedItem.dragging
793
234
                        property bool postDragging: false
794
235
                        property int startX
795
236
                        property int startY
796
237
797
238
                        onPressed: {
798
239
                            selectedItem = launcherListView.itemAt(mouseX, mouseY + launcherListView.realContentY)
799
240
                            selectedItem.highlighted = true
800
241
                        }
801
242
802
243
                        onClicked: {
803
244
                            var index = Math.floor((mouseY + launcherListView.realContentY) / launcherListView.realItemHeight);
804
245
                            var clickedItem = launcherListView.itemAt(mouseX, mouseY + launcherListView.realContentY)
805
246
806
247
                            // First/last item do the scrolling at more than 12 degrees
807
248
                            if (index == 0 || index == launcherListView.count - 1) {
808
249
                                if (clickedItem.angle > 12) {
809
250
                                    launcherListView.flick(0, -launcherListView.clickFlickSpeed);
810
251
                                } else if (clickedItem.angle < -12) {
811
252
                                    launcherListView.flick(0, launcherListView.clickFlickSpeed);
812
253
                                } else {
813
254
                                    root.applicationSelected(LauncherModel.get(index).desktopFile);
814
255
                                }
815
256
                                return;
816
257
                            }
817
258
818
259
                            // the rest launches apps up to an angle of 30 degrees
819
260
                            if (clickedItem.angle > 30) {
820
140
                                launcherListView.flick(0, -launcherListView.clickFlickSpeed);
261
                                launcherListView.flick(0, -launcherListView.clickFlickSpeed);
822
141
                            } else if (angle < -12) {
262
                            } else if (clickedItem.angle < -30) {
823
142
                                launcherListView.flick(0, launcherListView.clickFlickSpeed);
263
                                launcherListView.flick(0, launcherListView.clickFlickSpeed);
824
143
                            } else {
264
                            } else {
825
144
                                root.applicationSelected(LauncherModel.get(index).desktopFile);
265
                                root.applicationSelected(LauncherModel.get(index).desktopFile);
826
145
                            }
266
                            }
865
146
                            return;
267
                        }
866
147
                        }
268
867
148
269
                        onCanceled: {
868
149
                        // the rest launches apps up to an angle of 30 degrees
270
                            selectedItem.highlighted = false
869
150
                        if (angle > 30) {
271
                            selectedItem = undefined;
870
151
                            launcherListView.flick(0, -launcherListView.clickFlickSpeed);
272
                            preDragging = false;
871
152
                        } else if (angle < -30) {
273
                            postDragging = false;
872
153
                            launcherListView.flick(0, launcherListView.clickFlickSpeed);
274
                        }
873
154
                        } else {
275
874
155
                            root.applicationSelected(LauncherModel.get(index).desktopFile);
276
                        onReleased: {
875
156
                        }
277
                            var droppedIndex = draggedIndex;
876
157
                    }
278
                            if (dragging) {
877
158
                }
279
                                postDragging = true;
878
159
280
                            } else {
879
160
                MouseArea {
281
                                draggedIndex = -1;
880
161
                    id: topFoldingArea
282
                            }
881
162
                    anchors {
283
882
163
                        left: parent.left
284
                            selectedItem.highlighted = false
883
164
                        right: parent.right
285
                            selectedItem.dragging = false;
884
165
                        top: parent.top
286
                            selectedItem = undefined;
885
166
                        topMargin: launcherListView.topMargin
287
                            preDragging = false;
886
167
                    }
288
887
168
                    height: launcherListView.itemSize / 2
289
                            drag.target = undefined
888
169
                    enabled: launcherListView.contentY > -launcherListView.topMargin
290
889
170
                    onClicked: launcherListView.flick(0, launcherListView.clickFlickSpeed)
291
                            progressiveScrollingTimer.stop();
890
171
                }
292
                            launcherListView.interactive = true;
891
172
293
                            if (droppedIndex >= launcherListView.count - 2 && postDragging) {
892
173
                MouseArea {
294
                                launcherListView.flick(0, -launcherListView.clickFlickSpeed);
893
174
                    id: bottomFoldingArea
295
                            }
894
175
                    anchors {
296
                        }
895
176
                        left: parent.left
297
896
177
                        right: parent.right
298
                        onPressAndHold: {
897
178
                        bottom: parent.bottom
299
                            if (Math.abs(selectedItem.angle) > 30) {
898
179
                        bottomMargin: launcherListView.bottomMargin
300
                                return;
899
180
                    }
301
                            }
900
181
                    height: launcherListView.itemSize / 2
302
901
182
                    enabled: launcherListView.contentHeight - launcherListView.height - launcherListView.contentY > -launcherListView.bottomMargin
303
                            draggedIndex = Math.floor((mouseY + launcherListView.realContentY) / launcherListView.realItemHeight);
902
183
                    onClicked: launcherListView.flick(0, -launcherListView.clickFlickSpeed)
304
903
305
                            launcherListView.interactive = false
904
306
905
307
                            var yOffset = draggedIndex > 0 ? (mouseY + launcherListView.realContentY) % (draggedIndex * launcherListView.realItemHeight) : mouseY + launcherListView.realContentY
906
308
907
309
                            fakeDragItem.iconName = launcherListView.model.get(draggedIndex).icon
908
310
                            fakeDragItem.x = 0
909
311
                            fakeDragItem.y = mouseY - yOffset + launcherListView.anchors.topMargin + launcherListView.topMargin
910
312
                            fakeDragItem.angle = selectedItem.angle * (root.inverted ? -1 : 1)
911
313
                            fakeDragItem.offset = selectedItem.offset * (root.inverted ? -1 : 1)
912
314
                            fakeDragItem.flatten()
913
315
                            drag.target = fakeDragItem
914
316
915
317
                            startX = mouseX
916
318
                            startY = mouseY
917
319
                        }
918
320
919
321
                        onPositionChanged: {
920
322
                            if (draggedIndex >= 0) {
921
323
                                if (!selectedItem.dragging) {
922
324
                                    var distance = Math.max(Math.abs(mouseX - startX), Math.abs(mouseY - startY))
923
325
                                    if (!preDragging && distance > units.gu(1.5)) {
924
326
                                        preDragging = true;
925
327
                                    }
926
328
                                    if (distance > launcherListView.itemHeight) {
927
329
                                        selectedItem.dragging = true
928
330
                                        preDragging = false;
929
331
                                    }
930
332
                                }
931
333
                                if (!selectedItem.dragging) {
932
334
                                    return
933
335
                                }
934
336
935
337
                                var itemCenterY = fakeDragItem.y + fakeDragItem.height / 2
936
338
937
339
                                // Move it down by the the missing size to compensate index calculation with only expanded items
938
340
                                itemCenterY += (launcherListView.itemHeight - selectedItem.height) / 2
939
341
940
342
                                if (mouseY > launcherListView.height - launcherListView.topMargin - launcherListView.bottomMargin - launcherListView.realItemHeight) {
941
343
                                    progressiveScrollingTimer.downwards = false
942
344
                                    progressiveScrollingTimer.start()
943
345
                                } else if (mouseY < launcherListView.realItemHeight) {
944
346
                                    progressiveScrollingTimer.downwards = true
945
347
                                    progressiveScrollingTimer.start()
946
348
                                } else {
947
349
                                    progressiveScrollingTimer.stop()
948
350
                                }
949
351
950
352
                                var newIndex = (itemCenterY + launcherListView.realContentY) / launcherListView.realItemHeight
951
353
952
354
                                if (newIndex > draggedIndex + 1) {
953
355
                                    newIndex = draggedIndex + 1
954
356
                                } else if (newIndex < draggedIndex) {
955
357
                                    newIndex = draggedIndex -1
956
358
                                } else {
957
359
                                    return
958
360
                                }
959
361
960
362
                                if (newIndex >= 0 && newIndex < launcherListView.count) {
961
363
                                    launcherListView.model.move(draggedIndex, newIndex)
962
364
                                    draggedIndex = newIndex
963
365
                                }
964
366
                            }
965
367
                        }
966
368
                    }
967
369
                    Timer {
968
370
                        id: progressiveScrollingTimer
969
371
                        interval: 2
970
372
                        repeat: true
971
373
                        running: false
972
374
                        property bool downwards: true
973
375
                        onTriggered: {
974
376
                            if (downwards) {
975
377
                                var minY =  -launcherListView.topMargin
976
378
                                if (launcherListView.contentY > minY) {
977
379
                                    launcherListView.contentY = Math.max(launcherListView.contentY - units.dp(2), minY)
978
380
                                }
979
381
                            } else {
980
382
                                var maxY = launcherListView.contentHeight - launcherListView.height + launcherListView.topMargin + launcherListView.originY
981
383
                                if (launcherListView.contentY < maxY) {
982
384
                                    launcherListView.contentY = Math.min(launcherListView.contentY + units.dp(2), maxY)
983
385
                                }
984
386
                            }
985
387
                        }
986
388
                    }
987
389
                }
988
390
            }
989
391
990
392
            LauncherDelegate {
991
393
                id: fakeDragItem
992
394
                objectName: "fakeDragItem"
993
395
                visible: dndArea.draggedIndex >= 0 && !dndArea.postDragging
994
396
                itemWidth: launcherListView.itemWidth
995
397
                itemHeight: launcherListView.itemHeight
996
398
                height: itemHeight
997
399
                width: itemWidth
998
400
                rotation: root.rotation
999
401
                highlighted: true
1000
402
                itemOpacity: 0.8
1001
403
1002
404
                function flatten() {
1003
405
                    fakeDragItemAnimation.start();
1004
406
                }
1005
407
1006
408
                UbuntuNumberAnimation {
1007
409
                    id: fakeDragItemAnimation
1008
410
                    target: fakeDragItem;
1009
411
                    properties: "angle,offset";
1010
412
                    to: 0
1011
184
                }
413
                }
1012
185
            }
414
            }
1013
186
        }
415
        }
1014
187
416
1015
=== removed file 'Launcher/graphics/launcher_bg@18.png'
1016
188
Binary files Launcher/graphics/launcher_bg@18.png	2013-06-05 22:03:08 +0000 and Launcher/graphics/launcher_bg@18.png	1970-01-01 00:00:00 +0000 differ
417
Binary files Launcher/graphics/launcher_bg@18.png	2013-06-05 22:03:08 +0000 and Launcher/graphics/launcher_bg@18.png	1970-01-01 00:00:00 +0000 differ
1017
=== removed file 'Launcher/graphics/launcher_bg@18.sci'
1018
--- Launcher/graphics/launcher_bg@18.sci	2013-06-05 22:03:08 +0000
1019
+++ Launcher/graphics/launcher_bg@18.sci	1970-01-01 00:00:00 +0000
1020
@@ -1,5 +0,0 @@
1021
1
border.left: 0
1022
2
border.top: 0
1023
3
border.bottom: 0
1024
4
border.right: 24
1025
5
source: launcher_bg@18.png
1026
6
0
1027
=== added file 'Launcher/graphics/launcher_bg@30.png'
1028
7
Binary files Launcher/graphics/launcher_bg@30.png	1970-01-01 00:00:00 +0000 and Launcher/graphics/launcher_bg@30.png	2013-08-19 11:48:45 +0000 differ
1
Binary files Launcher/graphics/launcher_bg@30.png	1970-01-01 00:00:00 +0000 and Launcher/graphics/launcher_bg@30.png	2013-08-19 11:48:45 +0000 differ
1029
=== added file 'Launcher/graphics/launcher_bg@30.sci'
1030
--- Launcher/graphics/launcher_bg@30.sci	1970-01-01 00:00:00 +0000
1031
+++ Launcher/graphics/launcher_bg@30.sci	2013-08-19 11:48:45 +0000
1032
@@ -0,0 +1,5 @@
1033
1
border.left: 4
1034
2
border.top: 4
1035
3
border.bottom: 4
1036
4
border.right: 66
1037
5
source: launcher_bg@30.png
1038
0
6
1039
=== modified file 'plugins/Unity/Launcher/backend/launcherbackend.cpp'
1040
--- plugins/Unity/Launcher/backend/launcherbackend.cpp	2013-07-16 20:45:13 +0000
1041
+++ plugins/Unity/Launcher/backend/launcherbackend.cpp	2013-08-19 11:48:45 +0000
1042
@@ -101,7 +101,7 @@
1043
101
{
101
{
1044
102
    // TODO: return app's pinned state from settings
102
    // TODO: return app's pinned state from settings
1045
103
    Q_UNUSED(appId)
103
    Q_UNUSED(appId)
1047
104
    return true;
104
    return false;
1048
105
}
105
}
1049
106
106
1050
107
void LauncherBackend::setPinned(const QString &appId, bool pinned)
107
void LauncherBackend::setPinned(const QString &appId, bool pinned)
1051
108
108
1052
=== modified file 'plugins/Unity/Launcher/launcheritem.cpp'
1053
--- plugins/Unity/Launcher/launcheritem.cpp	2013-07-08 13:55:07 +0000
1054
+++ plugins/Unity/Launcher/launcheritem.cpp	2013-08-19 11:48:45 +0000
1055
@@ -33,7 +33,10 @@
1056
33
    m_count(0),
33
    m_count(0),
1057
34
    m_quickList(new QuickListModel(this))
34
    m_quickList(new QuickListModel(this))
1058
35
{
35
{
1060
36
36
    QuickListEntry pinningAction;
1061
37
    pinningAction.setActionId("pin_item");
1062
38
    pinningAction.setText("Pin to Launcher");
1063
39
    m_quickList->appendAction(pinningAction);
1064
37
}
40
}
1065
38
41
1066
39
QString LauncherItem::appId() const
42
QString LauncherItem::appId() const
1067
@@ -65,6 +68,10 @@
1068
65
{
68
{
1069
66
    if (m_pinned != pinned) {
69
    if (m_pinned != pinned) {
1070
67
        m_pinned = pinned;
70
        m_pinned = pinned;
1071
71
        QuickListEntry entry;
1072
72
        entry.setActionId("pin_item");
1073
73
        entry.setText(pinned ? "Remove from Launcher": "Pin to Launcher");
1074
74
        m_quickList->updateAction(entry);
1075
68
        Q_EMIT pinnedChanged(pinned);
75
        Q_EMIT pinnedChanged(pinned);
1076
69
    }
76
    }
1077
70
}
77
}
1078
71
78
1079
=== modified file 'plugins/Unity/Launcher/launchermodel.cpp'
1080
--- plugins/Unity/Launcher/launchermodel.cpp	2013-07-08 17:01:49 +0000
1081
+++ plugins/Unity/Launcher/launchermodel.cpp	2013-08-19 11:48:45 +0000
1082
@@ -82,8 +82,25 @@
1083
82
82
1084
83
void LauncherModel::move(int oldIndex, int newIndex)
83
void LauncherModel::move(int oldIndex, int newIndex)
1085
84
{
84
{
1088
85
    // Perform the move in our list
85
    // Make sure its not moved outside the lists
1089
86
    beginMoveRows(QModelIndex(), oldIndex, oldIndex, QModelIndex(), newIndex);
86
    if (newIndex < 0) {
1090
87
        newIndex = 0;
1091
88
    }
1092
89
    if (newIndex >= m_list.count()) {
1093
90
        newIndex = m_list.count()-1;
1094
91
    }
1095
92
1096
93
    // Nothing to do?
1097
94
    if (oldIndex == newIndex) {
1098
95
        return;
1099
96
    }
1100
97
1101
98
    // QList's and QAbstractItemModel's move implementation differ when moving an item up the list :/
1102
99
    // While QList needs the index in the resulting list, beginMoveRows expects it to be in the current list
1103
100
    // adjust the model's index by +1 in case we're moving upwards
1104
101
    int newModelIndex = newIndex > oldIndex ? newIndex+1 : newIndex;
1105
102
1106
103
    beginMoveRows(QModelIndex(), oldIndex, oldIndex, QModelIndex(), newModelIndex);
1107
87
    m_list.move(oldIndex, newIndex);
104
    m_list.move(oldIndex, newIndex);
1108
88
    endMoveRows();
105
    endMoveRows();
1109
89
106
1110
@@ -140,10 +157,23 @@
1111
140
        return;
157
        return;
1112
141
    }
158
    }
1113
142
159
1115
143
    QuickListModel *model = qobject_cast<QuickListModel*>(m_list.at(index)->quickList());
160
    LauncherItem *item = m_list.at(index);
1116
161
    QuickListModel *model = qobject_cast<QuickListModel*>(item->quickList());
1117
144
    if (model) {
162
    if (model) {
1118
145
        QString actionId = model->get(actionIndex).actionId();
163
        QString actionId = model->get(actionIndex).actionId();
1120
146
        m_backend->triggerQuickListAction(appId, actionId);
164
1121
165
        // Check if this is one of the launcher actions we handle ourselves
1122
166
        if (actionId == "pin_item") {
1123
167
            if (item->pinned()) {
1124
168
                requestRemove(appId);
1125
169
            } else {
1126
170
                pin(appId);
1127
171
            }
1128
172
1129
173
        // Nope, we don't know this action, let the backend forward it to the application
1130
174
        } else {
1131
175
            m_backend->triggerQuickListAction(appId, actionId);
1132
176
        }
1133
147
    }
177
    }
1134
148
}
178
}
1135
149
179
1136
150
180
1137
=== modified file 'plugins/Unity/Launcher/plugin.cpp'
1138
--- plugins/Unity/Launcher/plugin.cpp	2013-07-08 17:00:27 +0000
1139
+++ plugins/Unity/Launcher/plugin.cpp	2013-08-19 11:48:45 +0000
1140
@@ -41,7 +41,9 @@
1141
41
41
1142
42
    qmlRegisterUncreatableType<LauncherModelInterface>(uri, 0, 1, "LauncherModelInterface", "Abstract Interface. Cannot be instantiated.");
42
    qmlRegisterUncreatableType<LauncherModelInterface>(uri, 0, 1, "LauncherModelInterface", "Abstract Interface. Cannot be instantiated.");
1143
43
    qmlRegisterUncreatableType<LauncherItemInterface>(uri, 0, 1, "LauncherItemInterface", "Abstract Interface. Cannot be instantiated.");
43
    qmlRegisterUncreatableType<LauncherItemInterface>(uri, 0, 1, "LauncherItemInterface", "Abstract Interface. Cannot be instantiated.");
1144
44
    qmlRegisterUncreatableType<QuickListModelInterface>(uri, 0, 1, "QuickListInterface", "Abstract Interface. Cannot be instantiated.");
1145
44
45
1146
45
    qmlRegisterSingletonType<LauncherModel>(uri, 0, 1, "LauncherModel", modelProvider);
46
    qmlRegisterSingletonType<LauncherModel>(uri, 0, 1, "LauncherModel", modelProvider);
1147
46
    qmlRegisterUncreatableType<LauncherItem>(uri, 0, 1, "LauncherItem", "Can't create new Launcher Items in QML. Get them from the LauncherModel.");
47
    qmlRegisterUncreatableType<LauncherItem>(uri, 0, 1, "LauncherItem", "Can't create new Launcher Items in QML. Get them from the LauncherModel.");
1148
48
    qmlRegisterUncreatableType<QuickListModel>(uri, 0, 1, "QuickListModel", "Can't create a QuickListModel in QML. Get them from the LauncherItems.");
1149
47
}
49
}
1150
48
50
1151
=== modified file 'plugins/Unity/Launcher/quicklistmodel.cpp'
1152
--- plugins/Unity/Launcher/quicklistmodel.cpp	2013-07-08 13:55:07 +0000
1153
+++ plugins/Unity/Launcher/quicklistmodel.cpp	2013-08-19 11:48:45 +0000
1154
@@ -37,6 +37,17 @@
1155
37
    endInsertRows();
37
    endInsertRows();
1156
38
}
38
}
1157
39
39
1158
40
void QuickListModel::updateAction(const QuickListEntry &entry)
1159
41
{
1160
42
    for (int i = 0; i < m_list.count(); ++i) {
1161
43
        if (m_list.at(i).actionId() == entry.actionId()) {
1162
44
            m_list.replace(i, entry);
1163
45
            Q_EMIT dataChanged(index(i), index(i));
1164
46
            return;
1165
47
        }
1166
48
    }
1167
49
}
1168
50
1169
40
QuickListEntry QuickListModel::get(int index) const
51
QuickListEntry QuickListModel::get(int index) const
1170
41
{
52
{
1171
42
    return m_list.at(index);
53
    return m_list.at(index);
1172
43
54
1173
=== modified file 'plugins/Unity/Launcher/quicklistmodel.h'
1174
--- plugins/Unity/Launcher/quicklistmodel.h	2013-07-08 13:55:07 +0000
1175
+++ plugins/Unity/Launcher/quicklistmodel.h	2013-08-19 11:48:45 +0000
1176
@@ -36,6 +36,16 @@
1177
36
    ~QuickListModel();
36
    ~QuickListModel();
1178
37
37
1179
38
    void appendAction(const QuickListEntry &entry);
38
    void appendAction(const QuickListEntry &entry);
1180
39
1181
40
    /**
1182
41
     * @brief Update an existing action
1183
42
     * @param entry The new, updated entry
1184
43
     *
1185
44
     * This will only do something if entry.actionId is found in the model.
1186
45
     * To add a new entry, use appendAction().
1187
46
     */
1188
47
    void updateAction(const QuickListEntry &entry);
1189
48
1190
39
    QuickListEntry get(int index) const;
49
    QuickListEntry get(int index) const;
1191
40
50
1192
41
    int rowCount(const QModelIndex &parent = QModelIndex()) const;
51
    int rowCount(const QModelIndex &parent = QModelIndex()) const;
1193
42
52
1194
=== modified file 'tests/qmltests/Launcher/tst_Launcher.qml'
1195
--- tests/qmltests/Launcher/tst_Launcher.qml	2013-07-05 09:02:07 +0000
1196
+++ tests/qmltests/Launcher/tst_Launcher.qml	2013-08-19 11:48:45 +0000
1197
@@ -19,6 +19,7 @@
1198
19
import Unity.Test 0.1 as UT
19
import Unity.Test 0.1 as UT
1199
20
import ".."
20
import ".."
1200
21
import "../../../Launcher"
21
import "../../../Launcher"
1201
22
import Unity.Launcher 0.1
1202
22
23
1203
23
/* Nothing is shown at first. If you drag from left edge you will bring up the
24
/* Nothing is shown at first. If you drag from left edge you will bring up the
1204
24
   launcher. */
25
   launcher. */
1205
@@ -247,4 +248,63 @@
1206
247
        }
248
        }
1207
248
        */
249
        */
1208
249
    }
250
    }
1209
251
1210
252
    UT.UnityTestCase {
1211
253
        id: dndTestCase
1212
254
        name: "Drag and Drop"
1213
255
        when: windowShown && initTestCase.completed
1214
256
1215
257
        function test_dragndrop_data() {
1216
258
            return [
1217
259
                {tag: "startDrag", fullDrag: false},
1218
260
                {tag: "fullDrag", fullDrag: true},
1219
261
            ];
1220
262
        }
1221
263
1222
264
        function test_dragndrop(data) {
1223
265
            revealer.dragLauncherIntoView();
1224
266
            var draggedItem = findChild(launcher, "launcherDelegate5")
1225
267
            var item0 = findChild(launcher, "launcherDelegate0")
1226
268
            var fakeDragItem = findChild(launcher, "fakeDragItem")
1227
269
            var initialItemHeight = draggedItem.height
1228
270
            var item5Name = LauncherModel.get(5).iconName
1229
271
            var item4Name = LauncherModel.get(4).iconName
1230
272
1231
273
            // Initial state
1232
274
            compare(draggedItem.itemOpacity, 1, "Item's opacity is not 1 at beginning")
1233
275
            compare(fakeDragItem.visible, false, "FakeDragItem isn't invisible at the beginning")
1234
276
            tryCompare(findChild(draggedItem, "dropIndicator"), "opacity", 0)
1235
277
1236
278
            // Doing longpress
1237
279
            mousePress(draggedItem, draggedItem.width / 2, draggedItem.height / 2)
1238
280
            // DraggedItem needs to hide and fakeDragItem become visible
1239
281
            tryCompare(draggedItem, "itemOpacity", 0)
1240
282
            tryCompare(fakeDragItem, "visible", true)
1241
283
1242
284
            // Dragging a bit (> 1.5 gu)
1243
285
            mouseMove(draggedItem, -units.gu(2), draggedItem.height / 2)
1244
286
            // Other items need to expand and become 0.6 opaque
1245
287
            tryCompare(item0, "angle", 0)
1246
288
            tryCompare(item0, "itemOpacity", 0.6)
1247
289
1248
290
            if (data.fullDrag) {
1249
291
                // Dragging a bit more
1250
292
                mouseMove(draggedItem, -units.gu(15), draggedItem.height / 2, 100)
1251
293
                tryCompare(findChild(draggedItem, "dropIndicator"), "opacity", 1)
1252
294
                tryCompare(draggedItem, "height", units.gu(1))
1253
295
1254
296
                // Dragging downwards. Item needs to move in the model
1255
297
                mouseMove(draggedItem, -units.gu(15), -initialItemHeight)
1256
298
                waitForRendering(draggedItem)
1257
299
                compare(LauncherModel.get(5).iconName, item4Name)
1258
300
                compare(LauncherModel.get(5).iconName, item5Name)
1259
301
            }
1260
302
1261
303
            // Releasing and checking if initial values are restored
1262
304
            mouseRelease(draggedItem)
1263
305
            tryCompare(findChild(draggedItem, "dropIndicator"), "opacity", 0)
1264
306
            tryCompare(draggedItem, "itemOpacity", 1)
1265
307
            tryCompare(fakeDragItem, "visible", false)
1266
308
        }
1267
309
    }
1268
250
}
310
}
Status:	Merged
Approved by:	Michał Sawicz on 2013-08-19
Approved revision:	143
Merged at revision:	214
Proposed branch:	lp:~mzanetti/unity8/dnd-and-quicklists
Merge into:	lp:unity8
Diff against target:	1268 lines (+694/-364) 13 files modified Launcher/FoldingLauncherDelegate.qml (+94/-250) Launcher/Launcher.qml (+2/-2) Launcher/LauncherDelegate.qml (+137/-0) Launcher/LauncherPanel.qml (+330/-101) Launcher/graphics/launcher_bg@18.sci (+0/-5) Launcher/graphics/launcher_bg@30.sci (+5/-0) plugins/Unity/Launcher/backend/launcherbackend.cpp (+1/-1) plugins/Unity/Launcher/launcheritem.cpp (+8/-1) plugins/Unity/Launcher/launchermodel.cpp (+34/-4) plugins/Unity/Launcher/plugin.cpp (+2/-0) plugins/Unity/Launcher/quicklistmodel.cpp (+11/-0) plugins/Unity/Launcher/quicklistmodel.h (+10/-0) tests/qmltests/Launcher/tst_Launcher.qml (+60/-0)
To merge this branch:	bzr merge lp:~mzanetti/unity8/dnd-and-quicklists
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Michał Sawicz		2013-07-24	Approve on 2013-08-19
PS Jenkins bot (community)	continuous-integration		Approve on 2013-08-19
Review via email: mp+176653@code.launchpad.net