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

[Albert Astals Cid]

[shell] Update shell position on desktop work area resize

[Albert Astals Cid (aacid)]

There is a test for this at https://code.launchpad.net/~aacid/unity-2d/unity-2d_test_launcher_resize_on_desktop_resize/+merge/89726

[Michał Sawicz (saviq)]

review: Approve

=== modified file 'shell/app/shelldeclarativeview.cpp'
--- shell/app/shelldeclarativeview.cpp	2012-01-19 14:40:22 +0000
+++ shell/app/shelldeclarativeview.cpp	2012-01-23 16:28:29 +0000
@@ -98,6 +98,7 @@
     }
 
     //connect(desktop, SIGNAL(resized(int)), SLOT(updateDashModeDependingOnScreenGeometry()));
+    connect(QApplication::desktop(), SIGNAL(workAreaResized(int)), SLOT(updateShellPosition(int)));
 }
 
 // TODO: this is probably expressed more nicely in QML.
@@ -114,6 +115,14 @@
 }
 
 void
+ShellDeclarativeView::updateShellPosition(int screen)
+{
+    if (screen == QX11Info::appScreen()) {
+        move(QApplication::desktop()->availableGeometry(screen).topLeft());
+    }
+}
+
+void
 ShellDeclarativeView::focusOutEvent(QFocusEvent* event)
 {
     Unity2DDeclarativeView::focusOutEvent(event);

=== modified file 'shell/app/shelldeclarativeview.h'
--- shell/app/shelldeclarativeview.h	2012-01-13 11:39:29 +0000
+++ shell/app/shelldeclarativeview.h	2012-01-23 16:28:29 +0000
@@ -110,6 +110,7 @@
 
 private Q_SLOTS:
     void updateDashModeDependingOnScreenGeometry();
+    void updateShellPosition(int screen);
 
 private:
     void focusOutEvent(QFocusEvent* event);