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

[Albert Astals Cid]

Improvements to ShellDeclarativeView::updateShellPosition

Add comment about why the function is needed
Adapt the code so that more than one StrutManager is supported

=== modified file 'shell/app/shelldeclarativeview.cpp'
--- shell/app/shelldeclarativeview.cpp	2012-02-09 10:51:16 +0000
+++ shell/app/shelldeclarativeview.cpp	2012-02-09 12:32:31 +0000
@@ -94,27 +94,32 @@
 void
 ShellDeclarativeView::updateShellPosition()
 {
+    // ShellDeclarativeView is a dock window (Qt::WA_X11NetWmWindowTypeDock) this means it does not respect struts.
+    // We use availableGeometry to get the geometry with the struts applied and from there
+    // we remove any strut that we might be applying ourselves
     const QRect availableGeometry = m_screenInfo->availableGeometry();
     QPoint posToMove = availableGeometry.topLeft();
     if (qApp->isRightToLeft()) {
         posToMove.setX(availableGeometry.width() - width());
     }
 
-    StrutManager *strutManager = rootObject()->findChild<StrutManager*>();
-    if (strutManager && strutManager->enabled()) {
-        // Do not push ourselves
-        switch (strutManager->edge()) {
-            case Unity2dPanel::TopEdge:
-                posToMove.ry() -= strutManager->realHeight();
-            break;
+    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;
+            }
         }
     }