1
=== modified file 'qml/Launcher/Drawer.qml'
2
--- qml/Launcher/Drawer.qml	2017-03-24 11:51:31 +0000
3
+++ qml/Launcher/Drawer.qml	2017-04-04 11:14:47 +0000
4
@@ -28,6 +28,7 @@
5
28
    property int panelWidth: 0
28
    property int panelWidth: 0
6
29
    readonly property bool moving: listLoader.item && listLoader.item.moving
29
    readonly property bool moving: listLoader.item && listLoader.item.moving
7
30
    readonly property Item searchTextField: searchField
30
    readonly property Item searchTextField: searchField
8
31
    readonly property real delegateWidth: units.gu(10)
9
31
32
10
32
    signal applicationSelected(string appId)
33
    signal applicationSelected(string appId)
11
33
34
12
@@ -272,7 +273,7 @@
13
272
273
14
273
                            model: sortProxyModel
274
                            model: sortProxyModel
15
274
275
17
275
                            delegateWidth: units.gu(8)
276
                            delegateWidth: root.delegateWidth
18
276
                            delegateHeight: units.gu(10)
277
                            delegateHeight: units.gu(10)
19
277
                            delegate: drawerDelegateComponent
278
                            delegate: drawerDelegateComponent
20
278
                        }
279
                        }
21
@@ -332,7 +333,7 @@
22
332
                                filterLetter: model.letter
333
                                filterLetter: model.letter
23
333
                                dynamicSortFilter: false
334
                                dynamicSortFilter: false
24
334
                            }
335
                            }
26
335
                            delegateWidth: units.gu(8)
336
                            delegateWidth: root.delegateWidth
27
336
                            delegateHeight: units.gu(10)
337
                            delegateHeight: units.gu(10)
28
337
                            delegate: drawerDelegateComponent
338
                            delegate: drawerDelegateComponent
29
338
                        }
339
                        }
30
@@ -352,6 +353,7 @@
31
352
                readonly property bool focused: index === GridView.view.currentIndex && GridView.view.activeFocus
353
                readonly property bool focused: index === GridView.view.currentIndex && GridView.view.activeFocus
32
353
354
33
354
                onClicked: root.applicationSelected(model.appId)
355
                onClicked: root.applicationSelected(model.appId)
34
356
                z: loader.active ? 1 : 0
35
355
357
36
356
                Column {
358
                Column {
37
357
                    width: units.gu(8)
359
                    width: units.gu(8)
38
@@ -384,11 +386,50 @@
39
384
                    }
386
                    }
40
385
387
41
386
                    Label {
388
                    Label {
42
389
                        id: label
43
387
                        text: model.name
390
                        text: model.name
44
388
                        width: parent.width
391
                        width: parent.width
45
389
                        horizontalAlignment: Text.AlignHCenter
392
                        horizontalAlignment: Text.AlignHCenter
46
390
                        fontSize: "small"
393
                        fontSize: "small"
47
391
                        elide: Text.ElideRight
394
                        elide: Text.ElideRight
48
395
49
396
                        Loader {
50
397
                            id: loader
51
398
                            x: {
52
399
                                var aux = 0;
53
400
                                if (item) {
54
401
                                    aux = label.width / 2 - item.width / 2;
55
402
                                    var containerXMap = mapToItem(contentContainer, aux, 0).x
56
403
                                    if (containerXMap < 0) {
57
404
                                        aux = aux - containerXMap;
58
405
                                        containerXMap = 0;
59
406
                                    }
60
407
                                    if (containerXMap + item.width > contentContainer.width) {
61
408
                                        aux = aux - (containerXMap + item.width - contentContainer.width);
62
409
                                    }
63
410
                                }
64
411
                                return aux;
65
412
                            }
66
413
                            y: -units.gu(0.5)
67
414
                            active: label.truncated && (drawerDelegate.hovered || drawerDelegate.focused)
68
415
                            sourceComponent: Rectangle {
69
416
                                color: UbuntuColors.jet
70
417
                                width: fullLabel.contentWidth + units.gu(1)
71
418
                                height: fullLabel.height + units.gu(1)
72
419
                                radius: units.dp(4)
73
420
                                Label {
74
421
                                    id: fullLabel
75
422
                                    width: Math.min(root.delegateWidth * 2, implicitWidth)
76
423
                                    wrapMode: Text.Wrap
77
424
                                    horizontalAlignment: Text.AlignHCenter
78
425
                                    maximumLineCount: 3
79
426
                                    elide: Text.ElideRight
80
427
                                    anchors.centerIn: parent
81
428
                                    text: model.name
82
429
                                    fontSize: "small"
83
430
                                }
84
431
                            }
85
432
                        }
86
392
                    }
433
                    }
87
393
                }
434
                }
88
394
            }
435
            }
89
395
436
90
=== modified file 'tests/mocks/Unity/Launcher/MockAppDrawerModel.cpp'
91
--- tests/mocks/Unity/Launcher/MockAppDrawerModel.cpp	2017-01-16 11:12:00 +0000
92
+++ tests/mocks/Unity/Launcher/MockAppDrawerModel.cpp	2017-04-04 11:14:47 +0000
93
@@ -46,7 +46,7 @@
94
46
    m_list.append(item);
46
    m_list.append(item);
95
47
    item = new MockLauncherItem("calendar-app", "/usr/share/applications/calendar-app.desktop","Calendar", "calendar", this);
47
    item = new MockLauncherItem("calendar-app", "/usr/share/applications/calendar-app.desktop","Calendar", "calendar", this);
96
48
    m_list.append(item);
48
    m_list.append(item);
98
49
    item = new MockLauncherItem("libreoffice", "/usr/share/applications/libreoffice.desktop","Libre Office", "libreoffice", this);
49
    item = new MockLauncherItem("libreoffice", "/usr/share/applications/libreoffice.desktop","Libre Office Writer", "libreoffice", this);
99
50
    m_list.append(item);
50
    m_list.append(item);
100
51
51
101
52
    qsrand(QDateTime::currentMSecsSinceEpoch() / 1000);
52
    qsrand(QDateTime::currentMSecsSinceEpoch() / 1000);
Reviewer	Review Type	Date Requested	Status
Lukáš Tinkl (community)		2017-04-03	Approve on 2017-04-04
Unity8 CI Bot	continuous-integration		Approve on 2017-04-04
Review via email: mp+321720@code.launchpad.net