Merge lp:~cimi/unity-2d/fix-906235 into lp:unity-2d

[Andrea Cimitan]

Some fixes to dash layout, especially on the filters pane

[lp:~cimi/unity-2d/fix-906235]

833. By Andrea Cimitan on 2011-12-19

[dash] fix dash desktop height

[Gerry Boland (gerboland)]

This is great, thank you!

=== modified file 'places/CategoryHeader.qml'
--- places/CategoryHeader.qml	2011-12-11 16:36:28 +0000
+++ places/CategoryHeader.qml	2011-12-19 11:04:25 +0000
@@ -108,7 +108,7 @@
             folded: categoryHeader.folded
             anchors.left: label.right
             anchors.leftMargin: 10
-            anchors.verticalCenter: label.verticalCenter
+            anchors.bottom: label.baseline
         }
     }
 

=== modified file 'places/FilterCheckoption.qml'
--- places/FilterCheckoption.qml	2011-08-25 13:10:22 +0000
+++ places/FilterCheckoption.qml	2011-12-19 11:04:25 +0000
@@ -31,12 +31,14 @@
         rows: Math.ceil(count/columns)
 
         horizontalSpacing: 10
-        verticalSpacing: 12
+        verticalSpacing: 14
 
         cellWidth: width/columns
         delegateHeight: 30
 
-        height: cellHeight * rows
+        /* Substracting verticalSpacing so that the last row does
+           not have padding below it */
+        height: cellHeight * rows - verticalSpacing
         boundsBehavior: Flickable.StopAtBounds
 
         focus: true

=== modified file 'places/FilterPane.qml'
--- places/FilterPane.qml	2011-08-25 13:10:22 +0000
+++ places/FilterPane.qml	2011-12-19 11:04:25 +0000
@@ -82,6 +82,7 @@
             folded: filterPane.folded
 
             anchors.verticalCenter: title.verticalCenter
+            anchors.verticalCenterOffset: 1
             anchors.right: parent.right
         }
     }
@@ -101,7 +102,7 @@
         anchors.topMargin: 7
         anchors.bottom: parent.bottom
         orientation: ListView.Vertical
-        spacing: 12
+        spacing: 13
 
         /* Make sure the first section is selected when getting the focus */
         currentIndex: 0

=== modified file 'places/TickBox.qml'
--- places/TickBox.qml	2011-08-25 13:10:22 +0000
+++ places/TickBox.qml	2011-12-19 11:04:25 +0000
@@ -58,7 +58,7 @@
                       else return "#21ffffff" // 80% opaque
         border.width: ( checked ) ? 2 : 1
         color: ( checked ) ? "#21ffffff" : "transparent"
-        radius: 5
+        radius: 7
     }
 
     TextCustom {

=== modified file 'places/app/dashdeclarativeview.cpp'
--- places/app/dashdeclarativeview.cpp	2011-12-14 22:47:37 +0000
+++ places/app/dashdeclarativeview.cpp	2011-12-19 11:04:25 +0000
@@ -38,9 +38,9 @@
 
 #include <config.h>
 
-static const int DASH_DESKTOP_WIDTH = 989;
+static const int DASH_DESKTOP_WIDTH = 996;
 static const int DASH_DESKTOP_COLLAPSED_HEIGHT = 115;
-static const int DASH_DESKTOP_EXPANDED_HEIGHT = 606;
+static const int DASH_DESKTOP_EXPANDED_HEIGHT = 615;
 
 static const char* DASH_DBUS_SERVICE = "com.canonical.Unity2d.Dash";
 static const char* DASH_DBUS_OBJECT_PATH = "/Dash";

=== modified file 'places/artwork/arrow.png'
Binary files places/artwork/arrow.png	2011-02-13 22:11:25 +0000 and places/artwork/arrow.png	2011-12-19 11:04:25 +0000 differ
=== modified file 'places/dash.qml'
--- places/dash.qml	2011-12-15 11:27:51 +0000
+++ places/dash.qml	2011-12-19 11:04:25 +0000
@@ -243,7 +243,7 @@
             headerHeight: search_entry.height
             width: 300
             anchors.right: parent.right
-            anchors.rightMargin: 8
+            anchors.rightMargin: 15
         }
 
         Loader {