Merge lp:~tiagosh/unity-2d/fix-categories-divider into lp:unity-2d

[Tiago Salem Herrmann]

[dash] display category dividers instead of header underlines

[Tiago Salem Herrmann (tiagosh)]

after: http://ubuntuone.com/3a8vX9RCZQ5lq95XZVTcs0
before: http://ubuntuone.com/55IwZ7OV6wZYH5fmQrp3e8

[Xi Zhu (xi.zhu)]

Hi, I had a looked at the the screenshots.

Here are some tweaks:

1.All category header should be 1px to the right.
2.The first category should be 3px down.
3.The 2nd & 3rd categories should be 2px down.
4.All dividers should be 15px away from each sides, so from the very left edge is: 64px(launcher)+1px(white line)+15px(gap) then its the start of divider.
5.Because all icons are sitting in a 64px invisible box, the bottom of the box to the bottom of divider is 64px (or you can say its 63px +1px line)
6.The top of icon title to the invisible box is 10px.

I attached the measurement file to the original bug link on the top, hope it would help.

And Thanks very much for all these work!

[Tiago Salem Herrmann (tiagosh)]

Thanks Rosie,

some more changes: http://ubuntuone.com/0E8k4WA577UvEwiPlRDgIA

[Tiago Salem Herrmann (tiagosh)]

new screenshot: http://ubuntuone.com/0rquLUJhjVm2T9ic84tIwT

[Xi Zhu (xi.zhu)]

review: Approve (design)

[Michał Sawicz (saviq)]

You could possibly speed up the calculation by returning immediately when you find category == "0". There won't be any lower than that :)

review: Needs Fixing

[Tiago Salem Herrmann (tiagosh)]

good catch. just updated the branch.
Thanks.

[Albert Astals Cid (aacid)]

Looks good, nice to have Design people having a look at the screenshots :-)

review: Approve

[Michał Sawicz (saviq)]

review: Approve

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity-2d/185/console reported an error when processing this lp:~tiagosh/unity-2d/fix-categories-divider branch.
Not merging it.

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity-2d/187/console reported an error when processing this lp:~tiagosh/unity-2d/fix-categories-divider branch.
Not merging it.

[Didier Roche-Tolomelli (didrocks)]

now, the build environnement should install unity-common (for unity-2d only). Approving on behalf of the other approvals :)

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity-2d/189/console reported an error when processing this lp:~tiagosh/unity-2d/fix-categories-divider branch.
Not merging it.

=== modified file 'shell/dash/CategoryHeader.qml'
--- shell/dash/CategoryHeader.qml	2012-02-27 16:49:30 +0000
+++ shell/dash/CategoryHeader.qml	2012-03-09 14:34:21 +0000
@@ -36,6 +36,17 @@
 
     Accessible.name: "%1 %2 %3".arg(title.text).arg(label.text).arg(folded ? u2d.tr("not expanded") : u2d.tr("expanded"))
 
+    Rectangle {
+        id: divider
+
+        visible: !isFirst
+        color: "#21ffffff"
+        height: 1
+        anchors.top: parent.top
+        anchors.left: parent.left
+        anchors.right: parent.right
+    }
+
     Image {
         id: iconImage
 
@@ -43,9 +54,10 @@
 
         width: 22
         height: 22
-        anchors.bottom: underline.top
-        anchors.bottomMargin: 5
+        anchors.top: divider.bottom
+        anchors.topMargin: 13
         anchors.left: parent.left
+        anchors.leftMargin: 4
         fillMode: Image.PreserveAspectFit
         sourceSize.width: width
         sourceSize.height: height
@@ -55,8 +67,8 @@
         id: title
 
         fontSize: "large"
-        anchors.baseline: underline.top
-        anchors.baselineOffset: -10
+        anchors.top: divider.bottom
+        anchors.topMargin: 13
         anchors.left: iconImage.right
         anchors.leftMargin: 8
     }
@@ -96,15 +108,4 @@
             anchors.bottom: label.baseline
         }
     }
-
-    Rectangle {
-        id: underline
-
-        color: "#21ffffff"
-
-        height: 1
-        anchors.bottom: parent.bottom
-        anchors.left: parent.left
-        anchors.right: parent.right
-    }
 }

=== modified file 'shell/dash/Dash.qml'
--- shell/dash/Dash.qml	2012-02-27 10:47:50 +0000
+++ shell/dash/Dash.qml	2012-03-09 14:34:21 +0000
@@ -314,7 +314,6 @@
             KeyNavigation.down: lensBar
 
             anchors.top: search_entry.bottom
-            anchors.topMargin: 9
             anchors.bottom: lensBar.top
             anchors.left: parent.left
             anchors.right: !filterPane.visible || filterPane.folded ? parent.right : filterPane.left

=== modified file 'shell/dash/LensView.qml'
--- shell/dash/LensView.qml	2012-02-24 18:13:08 +0000
+++ shell/dash/LensView.qml	2012-03-09 14:34:21 +0000
@@ -25,6 +25,29 @@
 
     /* An instance of Lens */
     property variant model
+    property string firstNonEmptyCategory
+
+    function updateFirstCategory() {
+        if (lensView.model.results.count == 0)
+            return
+        var firstCategory = -1
+        for (var i = 0; i < lensView.model.results.count; i++) {
+            var result = lensView.model.results.get(i)
+            if (result.column_2 < firstCategory || firstCategory == -1) {
+                firstCategory = result.column_2
+                if (firstCategory == 0) {
+                    break
+                }
+            }
+        }
+        var category = lensView.model.categories.get(firstCategory)
+        firstNonEmptyCategory = category.column_0
+    }
+
+    Connections {
+        target: lensView.model.results
+        onCountChanged: updateFirstCategory()
+    }
 
     function activateFirstResult() {
         var firstResult = null
@@ -48,7 +71,7 @@
 
         focus: true
         anchors.fill: parent
-        anchors.leftMargin: 18
+        anchors.leftMargin: 15
 
         /* The category's delegate is chosen dynamically depending on what
            rendererName is returned by the CategoriesModel.
@@ -72,6 +95,7 @@
 
             source: rendererName ? Utils.convertToCamelCase(rendererName) + ".qml" : ""
             onStatusChanged: {
+                updateFirstCategory()
                 if (status == Loader.Error) {
                     console.log("Failed to load renderer %1. Using default renderer instead.".arg(rendererName))
                     source = "TileVertical.qml"
@@ -108,8 +132,9 @@
 
         headerDelegate: CategoryHeader {
             visible: body.item ? body.item.needHeader && body.visible : false
-            height: visible ? 32 : 0
+            height: visible ? 35 : 0
 
+            property bool isFirst: firstNonEmptyCategory == body.name
             property bool foldable: body.item ? body.item.folded != undefined : false
             availableCount: body.item ? foldable ? body.category_model.count - body.item.cellsPerRow : 0 : 0
             folded: body.item ? foldable ? body.item.folded : false : false