Merge lp:~aacid/unity8/spacier_drawer into lp:unity8

[Albert Astals Cid]

Tweak app drawer a bit

Make delegates a bit wider to have more breath space

Add a "tooltip" on hover for delegates whose text is truncated

 * Are there any related MPs required for this MP to build/function as expected?
No

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

 * If you changed the UI, has there been a design review?
No, needs one?

[Lukáš Tinkl (lukas-kde)]

Code looks good but could you get rid of the hardcoded colors?

color: UbuntuColors.jet
border.color: UbuntuColors.blue

review: Needs Information

[Albert Astals Cid (aacid)]

> Code looks good but could you get rid of the hardcoded colors?
>
> color: UbuntuColors.jet
> border.color: UbuntuColors.blue

I can if you suggest me something better.

FWIW the file is already a bit meh using "#BF000000" and "#20ffffff"

[lp:~aacid/unity8/spacier_drawer]

2915. By Albert Astals Cid on 2017-04-03

Make longer so that tryDrawer has one elided item

[Lukáš Tinkl (lukas-kde)]

OK, looks and works good enough for me; the "blue" color stands out a bit too much but I don't want to block on that.

review: Approve

[Unity8 CI Bot (unity8-ci-bot)]

PASSED: Continuous integration, rev:2914
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3647/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4840
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2964
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2964
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4868
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4679
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4679/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4679
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4679/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4679
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4679/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4679
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4679/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4679
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4679/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4679
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4679/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3647/rebuild

review: Approve (continuous-integration)

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2915
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3652/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4846
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2970
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2970
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4874
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4685
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4685/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4685
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4685/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4685
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4685/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4685
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4685/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4685
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4685/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4685
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4685/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3652/rebuild

review: Needs Fixing (continuous-integration)

[Unity8 CI Bot (unity8-ci-bot)]

PASSED: Continuous integration, rev:2915
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3656/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4850
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2972
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2972
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4878
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4689
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4689/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4689
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4689/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4689
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4689/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4689
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4689/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4689
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4689/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4689
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4689/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3656/rebuild

review: Approve (continuous-integration)

[lp:~aacid/unity8/spacier_drawer]

2916. By Albert Astals Cid on 2017-04-04

Limit fullLabel width and height

Also remove blue outline

2917. By Albert Astals Cid on 2017-04-04

also show the fulllabel if focused

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2916
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3660/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4858
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2975
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2975
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4886
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4697
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4697/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4697
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4697/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4697
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4697/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4697
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4697/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4697
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4697/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4697
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4697/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3660/rebuild

review: Needs Fixing (continuous-integration)

[Unity8 CI Bot (unity8-ci-bot)]

PASSED: Continuous integration, rev:2917
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3662/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4863
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2980
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2980
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4891
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4702
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4702/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4702
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4702/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4702
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4702/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4702
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4702/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4702
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4702/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4702
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4702/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3662/rebuild

review: Approve (continuous-integration)

[Lukáš Tinkl (lukas-kde)]

Yes, looks nice and works as expected

* Did you perform an exploratory manual test run of the code change and any related functionality?

Yes

* Did CI run pass? If not, please explain why.

Yes

review: Approve

=== modified file 'qml/Launcher/Drawer.qml'
--- qml/Launcher/Drawer.qml	2017-03-24 11:51:31 +0000
+++ qml/Launcher/Drawer.qml	2017-04-04 11:14:47 +0000
@@ -28,6 +28,7 @@
     property int panelWidth: 0
     readonly property bool moving: listLoader.item && listLoader.item.moving
     readonly property Item searchTextField: searchField
+    readonly property real delegateWidth: units.gu(10)
 
     signal applicationSelected(string appId)
 
@@ -272,7 +273,7 @@
 
                             model: sortProxyModel
 
-                            delegateWidth: units.gu(8)
+                            delegateWidth: root.delegateWidth
                             delegateHeight: units.gu(10)
                             delegate: drawerDelegateComponent
                         }
@@ -332,7 +333,7 @@
                                 filterLetter: model.letter
                                 dynamicSortFilter: false
                             }
-                            delegateWidth: units.gu(8)
+                            delegateWidth: root.delegateWidth
                             delegateHeight: units.gu(10)
                             delegate: drawerDelegateComponent
                         }
@@ -352,6 +353,7 @@
                 readonly property bool focused: index === GridView.view.currentIndex && GridView.view.activeFocus
 
                 onClicked: root.applicationSelected(model.appId)
+                z: loader.active ? 1 : 0
 
                 Column {
                     width: units.gu(8)
@@ -384,11 +386,50 @@
                     }
 
                     Label {
+                        id: label
                         text: model.name
                         width: parent.width
                         horizontalAlignment: Text.AlignHCenter
                         fontSize: "small"
                         elide: Text.ElideRight
+
+                        Loader {
+                            id: loader
+                            x: {
+                                var aux = 0;
+                                if (item) {
+                                    aux = label.width / 2 - item.width / 2;
+                                    var containerXMap = mapToItem(contentContainer, aux, 0).x
+                                    if (containerXMap < 0) {
+                                        aux = aux - containerXMap;
+                                        containerXMap = 0;
+                                    }
+                                    if (containerXMap + item.width > contentContainer.width) {
+                                        aux = aux - (containerXMap + item.width - contentContainer.width);
+                                    }
+                                }
+                                return aux;
+                            }
+                            y: -units.gu(0.5)
+                            active: label.truncated && (drawerDelegate.hovered || drawerDelegate.focused)
+                            sourceComponent: Rectangle {
+                                color: UbuntuColors.jet
+                                width: fullLabel.contentWidth + units.gu(1)
+                                height: fullLabel.height + units.gu(1)
+                                radius: units.dp(4)
+                                Label {
+                                    id: fullLabel
+                                    width: Math.min(root.delegateWidth * 2, implicitWidth)
+                                    wrapMode: Text.Wrap
+                                    horizontalAlignment: Text.AlignHCenter
+                                    maximumLineCount: 3
+                                    elide: Text.ElideRight
+                                    anchors.centerIn: parent
+                                    text: model.name
+                                    fontSize: "small"
+                                }
+                            }
+                        }
                     }
                 }
             }

=== modified file 'tests/mocks/Unity/Launcher/MockAppDrawerModel.cpp'
--- tests/mocks/Unity/Launcher/MockAppDrawerModel.cpp	2017-01-16 11:12:00 +0000
+++ tests/mocks/Unity/Launcher/MockAppDrawerModel.cpp	2017-04-04 11:14:47 +0000
@@ -46,7 +46,7 @@
     m_list.append(item);
     item = new MockLauncherItem("calendar-app", "/usr/share/applications/calendar-app.desktop","Calendar", "calendar", this);
     m_list.append(item);
-    item = new MockLauncherItem("libreoffice", "/usr/share/applications/libreoffice.desktop","Libre Office", "libreoffice", this);
+    item = new MockLauncherItem("libreoffice", "/usr/share/applications/libreoffice.desktop","Libre Office Writer", "libreoffice", this);
     m_list.append(item);
 
     qsrand(QDateTime::currentMSecsSinceEpoch() / 1000);