Merge lp:~cimi/unity-2d/unity-2d.not-recolor-workspace into lp:unity-2d

[Andrea Cimitan]

The new workspace switcher icon is white and transparent, resulting in a white tile on white icon. Do not recolor it now.
Ideally, LauncherItem.qml should colorize this icon (and BFB, and trash, and devices) using the background average color, and not by getting the icon color (Like unity 3D is doing).

[Florian Boucault (fboucault)]

Thank you Cimi. Is there a bug report matching the MR?

review: Approve

[Gerry Boland (gerboland)]

I created a bug & attached it. I'm assuming as Cimi made this, then it is designer approved. Approving!
Thank you Cimi!

review: Approve

=== modified file 'shell/launcher/LauncherList.qml'
--- shell/launcher/LauncherList.qml	2012-02-16 11:24:19 +0000
+++ shell/launcher/LauncherList.qml	2012-02-23 11:37:17 +0000
@@ -139,10 +139,9 @@
         isBeingDragged: (reorder.draggedTileId != "") && (reorder.draggedTileId == desktopFile)
         dragPosition: reorder.listCoordinates.y - list.contentY
 
-        /* Best way I could find to check if the item is an application or the
-           workspaces switcher. There may be something cleaner and better. */
-        backgroundFromIcon: item.toString().indexOf("Application") == 0 ||
-                            item.toString().indexOf("Workspaces") == 0
+        /* Best way I could find to check if the item is an application.
+           There may be something cleaner and better. */
+        backgroundFromIcon: item.toString().indexOf("Application") == 0
 
         Binding { target: item.menu; property: "title"; value: item.name }