Merge lp:~uriboni/unity-2d/spread-geometries-same-as-real-ones into lp:unity-2d/3.0

[Ugo Riboni]

[spread] Make sure the geometry of the windows and background in spread is exactly the same as the real ones so that intro and outro animations are correct

=== modified file 'spread/GnomeBackground.qml'
--- spread/GnomeBackground.qml	2011-03-22 06:04:20 +0000
+++ spread/GnomeBackground.qml	2011-04-19 14:29:23 +0000
@@ -83,7 +83,7 @@
         height: screen.geometry.height
 
         smooth: true
-        x: - screen.availableGeometry.x
+        x: - launcherMaximumWidth
         y: - screen.availableGeometry.y
 
         /* Possible modes are:

=== modified file 'spread/Windows.qml'
--- spread/Windows.qml	2011-04-11 09:23:01 +0000
+++ spread/Windows.qml	2011-04-19 14:29:23 +0000
@@ -150,7 +150,7 @@
                             target: spreadWindow
                             /* Note that we subtract the availableGeometry x and y since window.location is
                             expressed in global screen coordinates. */
-                            x: window.position.x - screen.availableGeometry.x
+                            x: window.position.x - launcherMaximumWidth
                             y: window.position.y - screen.availableGeometry.y
                             width: window.size.width
                             height: window.size.height

=== modified file 'spread/app/spread.cpp'
--- spread/app/spread.cpp	2011-03-07 14:52:11 +0000
+++ spread/app/spread.cpp	2011-04-19 14:29:23 +0000
@@ -26,6 +26,7 @@
 
 #include "spreadview.h"
 #include "spreadcontrol.h"
+#include "launcherclient.h"
 
 #include <unity2ddebug.h>
 
@@ -88,6 +89,8 @@
     control.connect(&view, SIGNAL(visibleChanged(bool)), SLOT(setIsShown(bool)));
     view.rootContext()->setContextProperty("control", &control);
 
+    view.rootContext()->setContextProperty("launcherMaximumWidth", LauncherClient::MaximumWidth);
+
     /* Load the QML UI, focus and show the window */
     view.setResizeMode(QDeclarativeView::SizeRootObjectToView);
     view.rootContext()->setContextProperty("spreadView", &view);