Merge lp:~tiagosh/unity-2d/fix-filter-pane into lp:unity-2d

[Tiago Salem Herrmann]

[dash] fix filter pane size and spacing between sections

[dash] fix filter pane size and spacing between sections

[Tiago Salem Herrmann (tiagosh)]

before: http://ubuntuone.com/40oEC5ITHkcrPOj5buSVtJ
after: http://ubuntuone.com/12ghNmCDUzoxeozn0VifWO

[Albert Astals Cid (aacid)]

Rosie approved via IRC the new looks

[Albert Astals Cid (aacid)]

Code looks good and works nice :-)

review: Approve

[Unity Merger (unity-merger)]

No commit message specified.

[Albert Astals Cid (aacid)]

FWIW my irc conversation with rosie went like
[12:40:22] <tsdgeos> rosie: Cimi: can you confirm that http://ubuntuone.com/12ghNmCDUzoxeozn0VifWO is better than http://ubuntuone.com/40oEC5ITHkcrPOj5buSVtJ (regarding the vertical spacing in the filters) ?
[12:49:35] <rosie> tsdgeos: yes, its better :)
[12:50:01] <tsdgeos> thanks, thought it was obvious, but better ask ;-)
[12:52:00] <rosie> tsdgeos: :D

=== modified file 'shell/dash/Filter.qml'
--- shell/dash/Filter.qml	2011-11-09 12:47:37 +0000
+++ shell/dash/Filter.qml	2012-03-19 17:32:21 +0000
@@ -23,6 +23,7 @@
 
     property variant lens
     property variant filterModel
+    property int sectionSpacing: 12
 
     height: childrenRect.height
 }

=== modified file 'shell/dash/FilterCheckoption.qml'
--- shell/dash/FilterCheckoption.qml	2012-01-24 12:14:59 +0000
+++ shell/dash/FilterCheckoption.qml	2012-03-19 17:32:21 +0000
@@ -39,8 +39,8 @@
         delegateHeight: 30
 
         /* Substracting verticalSpacing so that the last row does
-           not have padding below it */
-        height: cellHeight * rows - verticalSpacing
+           not have padding below it in case rows != 1 */
+        height: rows == 1 ? cellHeight + sectionSpacing : cellHeight * rows
         boundsBehavior: Flickable.StopAtBounds
 
         focus: true

=== modified file 'shell/dash/FilterMultirange.qml'
--- shell/dash/FilterMultirange.qml	2011-11-09 12:47:37 +0000
+++ shell/dash/FilterMultirange.qml	2012-03-19 17:32:21 +0000
@@ -21,7 +21,7 @@
 Filter {
     id: filterView
 
-    height: filters.height
+    height: filters.height + sectionSpacing
 
     MultiRangeView {
         id: filters

=== modified file 'shell/dash/FilterPane.qml'
--- shell/dash/FilterPane.qml	2012-02-27 21:20:08 +0000
+++ shell/dash/FilterPane.qml	2012-03-19 17:32:21 +0000
@@ -103,7 +103,6 @@
         anchors.topMargin: 7
         anchors.bottom: parent.bottom
         orientation: ListView.Vertical
-        spacing: 13
 
         /* Make sure the first section is selected when getting the focus */
         currentIndex: 0

=== modified file 'shell/dash/FilterRatings.qml'
--- shell/dash/FilterRatings.qml	2011-11-09 12:47:37 +0000
+++ shell/dash/FilterRatings.qml	2012-03-19 17:32:21 +0000
@@ -21,7 +21,7 @@
 Filter {
     id: filterView
 
-    height: rating.height
+    height: rating.height + sectionSpacing
 
     RatingStars {
         id: rating

=== modified file 'shell/dash/MultiRangeButton.qml'
--- shell/dash/MultiRangeButton.qml	2012-02-24 17:58:11 +0000
+++ shell/dash/MultiRangeButton.qml	2012-03-19 17:32:21 +0000
@@ -42,7 +42,6 @@
         color: "white"
         text: multiRangeButton.text
         elide: Text.ElideRight
-
     }
 
     Rectangle {