Merge lp:~aacid/unity-2d/strut_on_unloaded_launchers into lp:unity-2d

[Albert Astals Cid]

[launcher] Do not strut unloaded launchers

[launcher] Do not strut unloaded launchers

[Unity Merger (unity-merger)]

No commit message specified.

=== modified file 'shell/Shell.qml'
--- shell/Shell.qml	2012-03-14 08:21:58 +0000
+++ shell/Shell.qml	2012-03-15 14:29:19 +0000
@@ -265,7 +265,7 @@
         widget: declarativeView
         height: launcherLoader.height
         width: launcherLoader.width
-        enabled: Utils.clamp(launcher2dConfiguration.hideMode, 0, 2) == 0
+        enabled: launcherLoader.loadLauncher && Utils.clamp(launcher2dConfiguration.hideMode, 0, 2) == 0
     }
 
     PointerBarrier {

=== modified file 'tests/manual-tests/launcher.txt'
--- tests/manual-tests/launcher.txt	2012-02-01 12:58:03 +0000
+++ tests/manual-tests/launcher.txt	2012-03-15 14:29:19 +0000
@@ -105,3 +105,8 @@
 to take one second time to update.
 
 ----
+
+ * In a multimonitor environment, set launcher to always show and to show in only one screen
+
+Verify there is no strut in the rest of screens where the launcher would be
+----