Merge lp:~gerboland/unity-2d/lensBar-visual-artifacts-fix into lp:unity-2d

[Gerry Boland]

[dash] HACK: the DropShadow effect on the Home lensButton causes visual artifacts as the list of lenses is being populated, when the inter-lensButton spacing is non-zero. Can work around this by removing spacing and instead add padding to each lensButton. Fixes bug:833805

[lp:~gerboland/unity-2d/lensBar-visual-artifacts-fix]

674. By Gerry Boland on 2011-09-01

Merge with unity-2d trunk

=== modified file 'places/LensBar.qml'
--- places/LensBar.qml	2011-08-30 21:58:24 +0000
+++ places/LensBar.qml	2011-09-01 14:41:51 +0000
@@ -20,6 +20,8 @@
 import Unity2d 1.0
 
 FocusScope {
+    id: lensBar
+
     /* declare width & spacing of icons as required for layout calculations */
     property int iconWidth: 24
     property int iconSpacing: 36
@@ -41,13 +43,18 @@
     }
 
     /* LensBar contains a row of LensButtons */
+
+    /* Ugly Hack: the DropShadow effect on the Home lensButton causes visual artifacts as
+       the list of lenses is being populated, when the inter-lensButton spacing is non-zero.
+       A previously painted DropShadow remains in the (transparent) inter-lensButton space.
+       Can work around this by removing spacing and instead add padding to each lensButton.
+       DropShadow not officially supported until Qt4.8, when hopefully this will be fixed. */
     Row {
         id: lensContainer
 
         anchors.horizontalCenter: background.horizontalCenter
         anchors.top: background.top
         anchors.bottom: background.bottom
-        spacing: iconSpacing
 
         Keys.onPressed: if (handleKeyPress(event.key)) event.accepted = true
 
@@ -94,9 +101,10 @@
             icon: "artwork/lens-nav-home.svg"
             onClicked: dash.activateHome()
             active: ( dashView.activeLens == "" )
-            width: iconWidth
-            anchors.top: parent.top
-            anchors.bottom: parent.bottom
+            iconWidth: lensBar.iconWidth
+            iconSpacing: lensBar.iconSpacing
+            width: iconWidth+iconSpacing
+            height: lensContainer.height
         }
 
         /* Now fetch all other lenses and display */
@@ -109,9 +117,10 @@
                 icon: item.iconHint.indexOf("/") == -1 ? "image://icons/" + item.iconHint : item.iconHint
                 active: item.active
                 onClicked: dash.activateLens(item.id)
-                width: iconWidth
-                anchors.top: parent != undefined ? parent.top : undefined
-                anchors.bottom: parent != undefined ? parent.bottom : undefined
+                iconWidth: lensBar.iconWidth
+                iconSpacing: lensBar.iconSpacing
+                width: iconWidth+iconSpacing
+                height: lensContainer.height
             }
         }
     }

=== modified file 'places/LensButton.qml'
--- places/LensButton.qml	2011-08-12 17:04:39 +0000
+++ places/LensButton.qml	2011-09-01 14:41:51 +0000
@@ -25,6 +25,8 @@
 AbstractButton {
     property alias icon: icon.source
     property bool active: false
+    property int iconSpacing: 0
+    property int iconWidth: 24
 
     id: lensButton
 
@@ -40,6 +42,8 @@
         anchors.fill: parent
         anchors.topMargin: 7
         anchors.bottomMargin: 7
+        anchors.leftMargin: Math.floor(iconSpacing/2)
+        anchors.rightMargin: Math.ceil(iconSpacing/2)
 
         border.color: "white"
         border.width: 1