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

[Albert Astals Cid]

[panel] WindowHelper: Do not pass the screen number but the panel number since the panel's screen can change

WindowHelper: Do not pass the screen but the panel since the panel screen can change

=== modified file 'panel/applets/appname/appnameapplet.cpp'
--- panel/applets/appname/appnameapplet.cpp	2012-05-21 10:33:44 +0000
+++ panel/applets/appname/appnameapplet.cpp	2012-05-24 11:26:18 +0000
@@ -253,7 +253,7 @@
 
     void setupWindowHelper()
     {
-        m_windowHelper = new WindowHelper(q->panel()->screen(), q);
+        m_windowHelper = new WindowHelper(q->panel(), q);
         QObject::connect(m_windowHelper, SIGNAL(stateChanged()),
             q, SLOT(updateWidgets()));
         QObject::connect(m_windowHelper, SIGNAL(nameChanged()),

=== modified file 'panel/applets/appname/windowhelper.cpp'
--- panel/applets/appname/windowhelper.cpp	2012-04-23 15:43:10 +0000
+++ panel/applets/appname/windowhelper.cpp	2012-05-24 11:26:18 +0000
@@ -30,6 +30,7 @@
 #include <hudclient.h>
 #include <debug_p.h>
 #include <gconnector.h>
+#include <unity2dpanel.h>
 
 // Bamf
 #include <bamf-matcher.h>
@@ -57,15 +58,20 @@
 {
     WnckWindow* m_window;
     GConnector m_connector;
-    int m_screen;
+    Unity2dPanel *m_panel;
+
+    int screen() const
+    {
+        return m_panel->screen();
+    }
 };
 
-WindowHelper::WindowHelper(int screen, QObject* parent)
+WindowHelper::WindowHelper(Unity2dPanel *panel, QObject* parent)
 : QObject(parent)
 , d(new WindowHelperPrivate)
 {
     d->m_window = 0;
-    d->m_screen = screen;
+    d->m_panel = panel;
 
     wnck_screen_force_update(wnck_screen_get_default());
 
@@ -138,7 +144,7 @@
 
 bool WindowHelper::isMaximized() const
 {
-    if (DashClient::instance()->activeInScreen(d->m_screen)) {
+    if (DashClient::instance()->activeInScreen(d->screen())) {
         return dash2dConfiguration().property("fullScreen").toBool();
     } else {
         if (d->m_window) {
@@ -174,9 +180,9 @@
 
 void WindowHelper::close()
 {
-    if (DashClient::instance()->activeInScreen(d->m_screen)) {
+    if (DashClient::instance()->activeInScreen(d->screen())) {
         DashClient::instance()->setActive(false);
-    } else if (HUDClient::instance()->activeInScreen(d->m_screen)) {
+    } else if (HUDClient::instance()->activeInScreen(d->screen())) {
         HUDClient::instance()->setActive(false);
     } else {
         guint32 timestamp = QDateTime::currentDateTime().toTime_t();
@@ -186,14 +192,14 @@
 
 void WindowHelper::minimize()
 {
-    if (!DashClient::instance()->activeInScreen(d->m_screen)) {
+    if (!DashClient::instance()->activeInScreen(d->screen())) {
         wnck_window_minimize(d->m_window);
     }
 }
 
 void WindowHelper::maximize()
 {
-    if (DashClient::instance()->activeInScreen(d->m_screen)) {
+    if (DashClient::instance()->activeInScreen(d->screen())) {
         dash2dConfiguration().setProperty("fullScreen", QVariant(true));
     } else {
         /* This currently cannot happen, because the window buttons are not
@@ -205,7 +211,7 @@
 
 void WindowHelper::unmaximize()
 {
-    if (DashClient::instance()->activeInScreen(d->m_screen)) {
+    if (DashClient::instance()->activeInScreen(d->screen())) {
         dash2dConfiguration().setProperty("fullScreen", QVariant(false));
     } else {
         wnck_window_unmaximize(d->m_window);

=== modified file 'panel/applets/appname/windowhelper.h'
--- panel/applets/appname/windowhelper.h	2012-02-29 12:09:53 +0000
+++ panel/applets/appname/windowhelper.h	2012-05-24 11:26:18 +0000
@@ -29,12 +29,14 @@
 
 class QPoint;
 
+class Unity2dPanel;
+
 struct WindowHelperPrivate;
 class WindowHelper : public QObject
 {
 Q_OBJECT
 public:
-    WindowHelper(int screen, QObject* parent);
+    WindowHelper(Unity2dPanel *panel, QObject* parent);
     ~WindowHelper();
 
     void setXid(uint);

=== modified file 'tests/manual-tests/dash.txt'
--- tests/manual-tests/dash.txt	2012-04-20 13:13:08 +0000
+++ tests/manual-tests/dash.txt	2012-05-24 11:26:18 +0000
@@ -249,3 +249,15 @@
   #   * Verify video opens correctly in web browser
 
 -----
+
+# Test case objectives:
+  #  * Ensure dash can be maximized in a multimonitor scenario
+  # Pre-conditions
+  #   * Have two monitors
+  #   * Have the second monitor be the the primary monitor when you connect it
+  # Test steps
+  #   * Have one monitor attached
+  #   * Connect the second monitor
+  #   * Verify dash can be maximized in the first monitor (that is not the primary anymore)
+
+-----