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

[Albert Astals Cid]

Small improvement for ShellDeclarativeView::updateShellPosition

[Michał Sawicz (saviq)]

review: Approve

=== modified file 'shell/app/shelldeclarativeview.cpp'
--- shell/app/shelldeclarativeview.cpp	2012-02-28 12:00:14 +0000
+++ shell/app/shelldeclarativeview.cpp	2012-03-01 16:31:18 +0000
@@ -115,25 +115,27 @@
     const QRect availableGeometry = m_screenInfo->availableGeometry();
     QPoint posToMove = availableGeometry.topLeft();
     if (qApp->isRightToLeft()) {
-        posToMove.setX(availableGeometry.width() - width());
+        posToMove.rx() += (availableGeometry.width() - width());
     }
 
-    QList<StrutManager *> strutManagers = rootObject()->findChildren<StrutManager*>();
-    Q_FOREACH(StrutManager *strutManager, strutManagers) {
-        if (strutManager->enabled()) {
-            // Do not push ourselves
-            switch (strutManager->edge()) {
-                case Unity2dPanel::TopEdge:
-                    posToMove.ry() -= strutManager->realHeight();
-                break;
+    if (rootObject() != NULL) {
+        QList<StrutManager *> strutManagers = rootObject()->findChildren<StrutManager*>();
+        Q_FOREACH(StrutManager *strutManager, strutManagers) {
+            if (strutManager->enabled()) {
+                // Do not push ourselves
+                switch (strutManager->edge()) {
+                    case Unity2dPanel::TopEdge:
+                        posToMove.ry() -= strutManager->realHeight();
+                    break;
 
-                case Unity2dPanel::LeftEdge:
-                    if (qApp->isLeftToRight()) {
-                        posToMove.rx() -= strutManager->realWidth();
-                    } else {
-                        posToMove.rx() += strutManager->realWidth();
-                    }
-                break;
+                    case Unity2dPanel::LeftEdge:
+                        if (qApp->isLeftToRight()) {
+                            posToMove.rx() -= strutManager->realWidth();
+                        } else {
+                            posToMove.rx() += strutManager->realWidth();
+                        }
+                    break;
+                }
             }
         }
     }