Merge lp:~fboucault/unity-2d/fix_dash_width_always_visible_launcher into lp:~unity-2d-team/unity-2d/unity-2d-shell

[Florian Boucault]

[dash] Compute appropriate width when launcher's hide mode is set to never hide, ie 0

[Albert Astals Cid (aacid)]

ShellDeclarativeView::updateShellPosition already has some code that does this, it'd be cool if we could have it only in our place, tried using declarativeView.height and declarativeView.width ?

review: Needs Fixing

[Florian Boucault (fboucault)]

> ShellDeclarativeView::updateShellPosition already has some code that does
> this, it'd be cool if we could have it only in our place, tried using
> declarativeView.height and declarativeView.width ?

updateShellPosition only sets the position of the shell window, not the size. Also updateShellPosition is fishy code that I would love to verify and move to QML.

[Albert Astals Cid (aacid)]

Right, i see, what a about the other availableGeometry used in that very same file?

[Albert Astals Cid (aacid)]

Florian wants to fix things step by step, fair enough

review: Approve

=== modified file 'shell/Shell.qml'
--- shell/Shell.qml	2012-02-07 11:57:10 +0000
+++ shell/Shell.qml	2012-02-08 02:37:21 +0000
@@ -23,8 +23,11 @@
 
 Item {
     id: shell
-    height: declarativeView.screen.availableGeometry.height
-    width: declarativeView.screen.availableGeometry.width
+    /* Space reserved by strutManager is taken off screen.availableGeometry but
+       we want the shell to take all the available space, including the one we
+       reserved ourselves via strutManager. */
+    height: declarativeView.screen.availableGeometry.height + (strutManager.enabled ? strutManager.height : 0)
+    width: declarativeView.screen.availableGeometry.width + (strutManager.enabled ? strutManager.width : 0)
 
     Accessible.name: "shell"
 
@@ -92,7 +95,7 @@
         Binding {
             target: dashLoader.item
             property: "fullscreenWidth"
-            value: declarativeView.screen.availableGeometry.width - launcherLoader.width
+            value: shell.width - launcherLoader.width
         }
     }