1
=== modified file 'debian/control'
2
--- debian/control	2016-11-16 10:44:00 +0000
3
+++ debian/control	2016-11-24 16:06:51 +0000
4
@@ -49,6 +49,7 @@
5
49
               python3-all:any,
49
               python3-all:any,
6
50
               python3-setuptools,
50
               python3-setuptools,
7
51
               qml-module-qt-labs-folderlistmodel,
51
               qml-module-qt-labs-folderlistmodel,
8
52
               qml-module-qtqml-statemachine,
9
52
               qml-module-qtmultimedia (>= 5.4.1-1ubuntu19~overlay2),
53
               qml-module-qtmultimedia (>= 5.4.1-1ubuntu19~overlay2),
10
53
               qml-module-qtquick-layouts,
54
               qml-module-qtquick-layouts,
11
54
               qml-module-qtquick-xmllistmodel,
55
               qml-module-qtquick-xmllistmodel,
12
55
56
13
=== modified file 'qml/Launcher/LauncherDelegate.qml'
14
--- qml/Launcher/LauncherDelegate.qml	2016-06-03 11:13:46 +0000
15
+++ qml/Launcher/LauncherDelegate.qml	2016-11-24 16:06:51 +0000
16
@@ -22,6 +22,7 @@
17
22
22
18
23
    property int itemIndex: 0
23
    property int itemIndex: 0
19
24
    property string iconName
24
    property string iconName
20
25
    property string name
21
25
    property int count: 0
26
    property int count: 0
22
26
    property bool countVisible: false
27
    property bool countVisible: false
23
27
    property int progress: -1
28
    property int progress: -1
24
28
29
25
=== modified file 'qml/Launcher/LauncherPanel.qml'
26
--- qml/Launcher/LauncherPanel.qml	2016-11-09 15:02:55 +0000
27
+++ qml/Launcher/LauncherPanel.qml	2016-11-24 16:06:51 +0000
28
@@ -15,6 +15,7 @@
29
15
 */
15
 */
30
16
16
31
17
import QtQuick 2.4
17
import QtQuick 2.4
32
18
import QtQml.StateMachine 1.0 as DSM
33
18
import Ubuntu.Components 1.3
19
import Ubuntu.Components 1.3
34
19
import Unity.Launcher 0.1
20
import Unity.Launcher 0.1
35
20
import Ubuntu.Components.Popups 1.3
21
import Ubuntu.Components.Popups 1.3
36
@@ -31,7 +32,7 @@
37
31
    property bool dragging: false
32
    property bool dragging: false
38
32
    property bool moving: launcherListView.moving || launcherListView.flicking
33
    property bool moving: launcherListView.moving || launcherListView.flicking
39
33
    property bool preventHiding: moving || dndArea.draggedIndex >= 0 || quickList.state === "open" || dndArea.pressed
34
    property bool preventHiding: moving || dndArea.draggedIndex >= 0 || quickList.state === "open" || dndArea.pressed
41
34
                                 || mouseEventEater.containsMouse || dashItem.hovered
35
                                 || dndArea.containsMouse || dashItem.hovered
42
35
    property int highlightIndex: -2
36
    property int highlightIndex: -2
43
36
    property bool shortcutHintsShown: false
37
    property bool shortcutHintsShown: false
44
37
38
45
@@ -40,7 +41,7 @@
46
40
    signal kbdNavigationCancelled()
41
    signal kbdNavigationCancelled()
47
41
42
48
42
    onXChanged: {
43
    onXChanged: {
50
43
        if (quickList.state == "open") {
44
        if (quickList.state === "open") {
51
44
            quickList.state = ""
45
            quickList.state = ""
52
45
        }
46
        }
53
46
    }
47
    }
54
@@ -69,7 +70,6 @@
55
69
        id: mouseEventEater
70
        id: mouseEventEater
56
70
        anchors.fill: parent
71
        anchors.fill: parent
57
71
        acceptedButtons: Qt.AllButtons
72
        acceptedButtons: Qt.AllButtons
58
72
        hoverEnabled: true
59
73
        onWheel: wheel.accepted = true;
73
        onWheel: wheel.accepted = true;
60
74
    }
74
    }
61
75
75
62
@@ -225,6 +225,7 @@
63
225
                        // the right app when running autopilot tests for
225
                        // the right app when running autopilot tests for
64
226
                        // multiple apps.
226
                        // multiple apps.
65
227
                        readonly property string appId: model.appId
227
                        readonly property string appId: model.appId
66
228
                        name: model.name
67
228
                        itemIndex: index
229
                        itemIndex: index
68
229
                        itemHeight: launcherListView.itemHeight
230
                        itemHeight: launcherListView.itemHeight
69
230
                        itemWidth: launcherListView.itemWidth
231
                        itemWidth: launcherListView.itemWidth
70
@@ -399,6 +400,7 @@
71
399
                        id: dndArea
400
                        id: dndArea
72
400
                        objectName: "dndArea"
401
                        objectName: "dndArea"
73
401
                        acceptedButtons: Qt.LeftButton | Qt.RightButton
402
                        acceptedButtons: Qt.LeftButton | Qt.RightButton
74
403
                        hoverEnabled: true
75
402
                        anchors {
404
                        anchors {
76
403
                            fill: parent
405
                            fill: parent
77
404
                            topMargin: launcherListView.topMargin
406
                            topMargin: launcherListView.topMargin
78
@@ -828,4 +830,78 @@
79
828
            }
830
            }
80
829
        }
831
        }
81
830
    }
832
    }
82
833
83
834
    Tooltip {
84
835
        id: tooltipShape
85
836
        objectName: "tooltipShape"
86
837
87
838
        visible: tooltipShownState.active
88
839
        rotation: root.rotation
89
840
        y: itemCenter - (height / 2)
90
841
91
842
        anchors {
92
843
            left: root.inverted ? undefined : parent.right
93
844
            right: root.inverted ? parent.left : undefined
94
845
            margins: units.gu(1)
95
846
        }
96
847
97
848
        readonly property var hoveredItem: dndArea.containsMouse ? launcherListView.itemAt(dndArea.mouseX, dndArea.mouseY + launcherListView.realContentY) : null
98
849
        readonly property int itemCenter: !hoveredItem ? 0 : root.mapFromItem(hoveredItem, 0, 0).y + (hoveredItem.height / 2) + hoveredItem.offset
99
850
100
851
        text: !hoveredItem ? "" : hoveredItem.name
101
852
    }
102
853
103
854
    DSM.StateMachine {
104
855
        id: tooltipStateMachine
105
856
        initialState: tooltipHiddenState
106
857
        running: true
107
858
108
859
        DSM.State {
109
860
            id: tooltipHiddenState
110
861
111
862
            DSM.SignalTransition {
112
863
                targetState: tooltipShownState
113
864
                signal: tooltipShape.hoveredItemChanged
114
865
                // !dndArea.pressed allows us to filter out touch input events
115
866
                guard: tooltipShape.hoveredItem !== null && !dndArea.pressed && !root.moving
116
867
            }
117
868
        }
118
869
119
870
        DSM.State {
120
871
            id: tooltipShownState
121
872
122
873
            DSM.SignalTransition {
123
874
                targetState: tooltipHiddenState
124
875
                signal: tooltipShape.hoveredItemChanged
125
876
                guard: tooltipShape.hoveredItem === null
126
877
            }
127
878
128
879
            DSM.SignalTransition {
129
880
                targetState: tooltipDismissedState
130
881
                signal: dndArea.onPressed
131
882
            }
132
883
133
884
            DSM.SignalTransition {
134
885
                targetState: tooltipDismissedState
135
886
                signal: quickList.stateChanged
136
887
                guard: quickList.state === "open"
137
888
            }
138
889
        }
139
890
140
891
        DSM.State {
141
892
            id: tooltipDismissedState
142
893
143
894
            DSM.SignalTransition {
144
895
                targetState: tooltipHiddenState
145
896
                signal: dndArea.positionChanged
146
897
                guard: quickList.state != "open" && !dndArea.pressed && !dndArea.moving
147
898
            }
148
899
149
900
            DSM.SignalTransition {
150
901
                targetState: tooltipHiddenState
151
902
                signal: dndArea.exited
152
903
                guard: quickList.state != "open"
153
904
            }
154
905
        }
155
906
    }
156
831
}
907
}
157
832
908
158
=== added file 'qml/Launcher/Tooltip.qml'
159
--- qml/Launcher/Tooltip.qml	1970-01-01 00:00:00 +0000
160
+++ qml/Launcher/Tooltip.qml	2016-11-24 16:06:51 +0000
161
@@ -0,0 +1,72 @@
162
1
/*
163
2
 * Copyright (C) 2016 Canonical, Ltd.
164
3
 *
165
4
 * This program is free software; you can redistribute it and/or modify
166
5
 * it under the terms of the GNU General Public License as published by
167
6
 * the Free Software Foundation; version 3.
168
7
 *
169
8
 * This program is distributed in the hope that it will be useful,
170
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
171
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
172
11
 * GNU General Public License for more details.
173
12
 *
174
13
 * You should have received a copy of the GNU General Public License
175
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
176
15
 */
177
16
178
17
import QtQuick 2.4
179
18
import Ubuntu.Components 1.3
180
19
181
20
UbuntuShape {
182
21
    id: root
183
22
184
23
    // This property holds the delay (milliseconds) after which the tool tip is shown.
185
24
    // A tooltip with a negative delay is shown immediately. The default value is 500 ms.
186
25
    property int delay:  500
187
26
188
27
    // This property holds the text shown on the tool tip.
189
28
    property alias text: label.text
190
29
191
30
    aspect: UbuntuShape.Flat
192
31
    color: theme.palette.normal.background
193
32
    width: label.implicitWidth + units.gu(4)
194
33
    height: label.implicitHeight + units.gu(2)
195
34
    opacity: 0
196
35
197
36
    Image {
198
37
        anchors {
199
38
            right: parent.left
200
39
            rightMargin: -units.dp(4)
201
40
            verticalCenter: parent.verticalCenter
202
41
        }
203
42
        source: "graphics/quicklist_tooltip.png"
204
43
        rotation: 90
205
44
    }
206
45
207
46
    Label {
208
47
        id: label
209
48
        anchors.centerIn: parent
210
49
        color: theme.palette.normal.backgroundText
211
50
    }
212
51
213
52
    states: [
214
53
        State {
215
54
            name: "visible"
216
55
            when: root.visible
217
56
            PropertyChanges {
218
57
                target: root
219
58
                opacity: 0.95
220
59
            }
221
60
        }
222
61
    ]
223
62
224
63
    transitions: [
225
64
        Transition {
226
65
            from: ""; to: "visible"
227
66
            SequentialAnimation {
228
67
                PauseAnimation { duration: root.delay }
229
68
                UbuntuNumberAnimation { target: root; property: "opacity"; duration: UbuntuAnimation.BriskDuration }
230
69
            }
231
70
        }
232
71
    ]
233
72
}
234
0
\ No newline at end of file
73
\ No newline at end of file
235
1
74
236
=== modified file 'tests/qmltests/Launcher/tst_Launcher.qml'
237
--- tests/qmltests/Launcher/tst_Launcher.qml	2016-11-16 10:44:13 +0000
238
+++ tests/qmltests/Launcher/tst_Launcher.qml	2016-11-24 16:06:51 +0000
239
@@ -1369,6 +1369,95 @@
240
1369
            tryCompare(clickThroughSpy, "count", 0);
1369
            tryCompare(clickThroughSpy, "count", 0);
241
1370
        }
1370
        }
242
1371
1371
243
1372
        function test_tooltip() {
244
1373
            launcher.lockedVisible = true;
245
1374
            revealByEdgePush();
246
1375
247
1376
            var item = findChild(launcher, "launcherDelegate0");
248
1377
            var tooltipShape = findChild(launcher, "tooltipShape");
249
1378
250
1379
            // Initial state
251
1380
            tryCompare(tooltipShape, "visible", false);
252
1381
            tryCompare(tooltipShape, "opacity", .0);
253
1382
254
1383
            // Move the mouse on the launcher icon
255
1384
            mouseMove(item, item.width / 2, item.height / 2, 10);
256
1385
            mouseMove(item, item.width / 2 + 1, item.height / 2, 10);
257
1386
            tryCompare(tooltipShape, "visible", true);
258
1387
            tryCompare(tooltipShape, "opacity", .95);
259
1388
260
1389
            // Move the mouse away
261
1390
            mouseMove(root, root.width, root.height / 2, 10);
262
1391
            tryCompare(tooltipShape, "visible", false);
263
1392
            tryCompare(tooltipShape, "opacity", .0);
264
1393
        }
265
1394
266
1395
        function test_quicklist_dismisses_tooltip() {
267
1396
            launcher.lockedVisible = true;
268
1397
            revealByEdgePush();
269
1398
270
1399
            var item = findChild(launcher, "launcherDelegate0");
271
1400
            var tooltipShape = findChild(launcher, "tooltipShape");
272
1401
            var quickListShape = findChild(launcher, "quickListShape");
273
1402
274
1403
            // Initial state
275
1404
            tryCompare(tooltipShape, "visible", false);
276
1405
            tryCompare(tooltipShape, "opacity", .0);
277
1406
278
1407
            // Move the mouse on the launcher icon
279
1408
            mouseMove(item, item.width / 2, item.height / 2, 10);
280
1409
            mouseMove(item, item.width / 2 + 1, item.height / 2, 10);
281
1410
            tryCompare(tooltipShape, "visible", true);
282
1411
            tryCompare(tooltipShape, "opacity", .95);
283
1412
284
1413
            // Right click to show the quicklist
285
1414
            mouseClick(item, item.width / 2, item.height / 2, Qt.RightButton);
286
1415
            tryCompare(quickListShape, "visible", true);
287
1416
            tryCompare(tooltipShape, "visible", false);
288
1417
            tryCompare(tooltipShape, "opacity", .0);
289
1418
290
1419
            // Left click hides the quicklist, tooltip is still dismissed
291
1420
            mouseClick(item, item.width / 2, item.height / 2, Qt.LefftButton);
292
1421
            tryCompare(quickListShape, "visible", false);
293
1422
            tryCompare(tooltipShape, "visible", false);
294
1423
            tryCompare(tooltipShape, "opacity", .0);
295
1424
296
1425
            // Mouse motion should should show tooltip again
297
1426
            mouseMove(item, item.width / 2, item.height / 2, 10);
298
1427
            mouseMove(item, item.width / 2 + 1, item.height / 2, 10);
299
1428
            tryCompare(tooltipShape, "visible", true);
300
1429
            tryCompare(tooltipShape, "opacity", .95);
301
1430
        }
302
1431
303
1432
        function test_click_dismisses_tooltip() {
304
1433
            launcher.lockedVisible = true;
305
1434
            revealByEdgePush();
306
1435
307
1436
            var item = findChild(launcher, "launcherDelegate0");
308
1437
            var tooltipShape = findChild(launcher, "tooltipShape");
309
1438
310
1439
            // Initial state
311
1440
            tryCompare(tooltipShape, "visible", false);
312
1441
            tryCompare(tooltipShape, "opacity", .0);
313
1442
314
1443
            // Move the mouse on the launcher icon
315
1444
            mouseMove(item, item.width / 2, item.height / 2, 10);
316
1445
            mouseMove(item, item.width / 2 + 1, item.height / 2, 10);
317
1446
            tryCompare(tooltipShape, "visible", true);
318
1447
            tryCompare(tooltipShape, "opacity", .95);
319
1448
320
1449
            // Left click should dismiss the tooltip
321
1450
            mouseClick(item, item.width / 2 + 1, item.height / 2, Qt.LeftButton);
322
1451
            tryCompare(tooltipShape, "visible", false);
323
1452
            tryCompare(tooltipShape, "opacity", .0);
324
1453
325
1454
            // Mouse motion should should show tooltip again
326
1455
            mouseMove(item, item.width / 2, item.height / 2, 10);
327
1456
            mouseMove(item, item.width / 2 + 1, item.height / 2, 10);
328
1457
            tryCompare(tooltipShape, "visible", true);
329
1458
            tryCompare(tooltipShape, "opacity", .95);
330
1459
        }
331
1460
332
1372
        function test_launcherEnabledSetting() {
1461
        function test_launcherEnabledSetting() {
333
1373
            launcher.available = true;
1462
            launcher.available = true;
334
1374
1463
Status:	Superseded
Proposed branch:	lp:~azzar1/unity8/launcher-tooltips
Merge into:	lp:unity8
Prerequisite:	lp:~azzar1/unity8/remove-UbuntuShapeForItem
Diff against target:	333 lines (+242/-3) 5 files modified debian/control (+1/-0) qml/Launcher/LauncherDelegate.qml (+1/-0) qml/Launcher/LauncherPanel.qml (+79/-3) qml/Launcher/Tooltip.qml (+72/-0) tests/qmltests/Launcher/tst_Launcher.qml (+89/-0)
To merge this branch:	bzr merge lp:~azzar1/unity8/launcher-tooltips
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Michael Zanetti (community)		2016-10-20	Approve on 2016-11-25
Unity8 CI Bot	continuous-integration	2016-10-20	Approve on 2016-11-24
Michał Sawicz			Needs Fixing on 2016-11-24
Albert Astals Cid (community)		2016-10-20	Abstain on 2016-11-24
Lukáš Tinkl		2016-10-20	Pending
Review via email: mp+308903@code.launchpad.net