Unity 8

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

spacier_drawer
Merge into trunk

Proposed by Albert Astals Cid on 2017-04-03

Status:

Merged

Approved by:

Lukáš Tinkl on 2017-04-04

Approved revision:

2917

Merged at revision:

2920

Proposed branch:

lp:~aacid/unity8/spacier_drawer

Merge into:

lp:unity8

Diff against target:

101 lines (+44/-3)

2 files modified

qml/Launcher/Drawer.qml (+43/-2)
tests/mocks/Unity/Launcher/MockAppDrawerModel.cpp (+1/-1)

To merge this branch:

bzr merge lp:~aacid/unity8/spacier_drawer

High

Fix Released

Link a bug report

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

Commit Message

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

Description of the Change

* 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) wrote on 2017-04-03:

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) wrote on 2017-04-03:

> 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 updated on 2017-04-03

2915. By Albert Astals Cid on 2017-04-03: Make longer so that tryDrawer has one elided item

Lukáš Tinkl (lukas-kde) wrote on 2017-04-03:

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) wrote on 2017-04-03:

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) wrote on 2017-04-03:

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) wrote on 2017-04-03:

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 updated on 2017-04-04

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) wrote on 2017-04-04:

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) wrote on 2017-04-04:

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) wrote on 2017-04-04:

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Albert Astals Cid

Mohammad Rakibul Hasan

Unity Team

 === 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);