Merge lp:~aacid/unity-2d/unity-2d-shell_limit_shell_width into lp:~unity-2d-team/unity-2d/unity-2d-shell

[Albert Astals Cid]

Do not try to be wider than the total screen geometry

Happens sometimes on startup when the enabled and availableGeometry are still in flux and it might end up meaning a badly sized shell view

[lp:~aacid/unity-2d/unity-2d-shell_limit_shell_width]

1005. By Albert Astals Cid on 2012-02-10

Add comment as to why the min is needed

=== modified file 'shell/Shell.qml'
--- shell/Shell.qml	2012-02-10 16:39:03 +0000
+++ shell/Shell.qml	2012-02-10 17:01:29 +0000
@@ -27,7 +27,10 @@
        we want the shell to take all the available space, including the one we
        reserved ourselves via strutManager. */
     height: declarativeView.screen.availableGeometry.height
-    width: declarativeView.screen.availableGeometry.width + (strutManager.enabled ? strutManager.width : 0)
+    // We need the min because X is async thus it can happen that even if strutManager.enabled is true
+    // declarativeView.screen.availableGeometry.width still has not been updated and thus the sum might be bigger than declarativeView.screen.geometry.width.
+    // The real nice and proper solution would be strutManager having a hasTheChangeBeenApplied property
+    width: Math.min(declarativeView.screen.geometry.width, declarativeView.screen.availableGeometry.width + (strutManager.enabled ? strutManager.width : 0))
 
     Accessible.name: "shell"