Merge lp:~tiagosh/unity-2d/fix-launcher-highlight into lp:unity-2d

[Tiago Salem Herrmann]

[shell][launcher] tiles highlight incorrect, highlight only visible at edge

[shell][launcher] tiles highlight incorrect, highlight only visible at edge

[Tiago Salem Herrmann (tiagosh)]

before: http://ubuntuone.com/1FYhkEIsaYtePWcs2cek7x
after: http://ubuntuone.com/4RSB5NWNBRaqdX6F5UQ58j

=== modified file 'shell/common/IconTile.qml'
--- shell/common/IconTile.qml	2012-02-09 11:53:03 +0000
+++ shell/common/IconTile.qml	2012-03-12 20:48:33 +0000
@@ -47,13 +47,13 @@
         smooth: true
 
         source: {
-            if (selectedTileBackgroundImage != "" && declarativeView.focus && activeFocus) {
+            if (selectedTileBackgroundImage != "" && declarativeView.focus && iconTile.activeFocus) {
                 return selectedTileBackgroundImage
             } else if (tileBackgroundImage != "") {
                 return tileBackgroundImage
             }
 
-            var actualColor = declarativeView.focus && activeFocus ? selectedBackgroundColor : color
+            var actualColor = declarativeView.focus && iconTile.activeFocus ? selectedBackgroundColor : color
             return "image://blended/%1color=%2alpha=%3"
                 .arg("common/artwork/round_corner_54x54.png")
                 .arg(actualColor.toString().replace("#", ""))