Merge lp:~osomon/unity-2d/one-panel-per-screen into lp:unity-2d/3.0

[Olivier Tilloy]

[panel] Always show the main panel on the leftmost monitor, not the primary one.
The main panel is the one that contains the Ubuntu button that invokes the dash, and hosts the legacy systray icons.

Also fix the window controls to be displayed only on one panel for maximized windows.

[Aurélien Gâteau (agateau)]

Great work!

review: Approve

=== modified file 'panel/app/panelmanager.cpp'
--- panel/app/panelmanager.cpp	2011-04-04 16:44:29 +0000
+++ panel/app/panelmanager.cpp	2011-04-26 15:35:40 +0000
@@ -75,13 +75,13 @@
     panel->setPalette(getPalette());
     panel->setFixedHeight(24);
 
-    int primary = QApplication::desktop()->primaryScreen();
-    if (screen == primary) {
+    int leftmost = QApplication::desktop()->screenNumber(QPoint());
+    if (screen == leftmost) {
         panel->addWidget(new HomeButtonApplet);
         panel->addWidget(createSeparator());
     }
     panel->addWidget(new AppNameApplet);
-    if (screen == primary) {
+    if (screen == leftmost) {
         /* It doesn’t make sense to have more than one instance of the systray,
            XEmbed’ed windows can be displayed only once anyway. */
         panel->addWidget(new LegacyTrayApplet);
@@ -111,19 +111,39 @@
 void
 PanelManager::onScreenCountChanged(int newCount)
 {
-    QDesktopWidget* desktop = QApplication::desktop();
-    int size = m_panels.size();
-    /* Update the position of existing panels, and instantiate new panels. */
-    for (int i = 0; i < newCount; ++i) {
+    if (newCount > 0) {
+        QDesktopWidget* desktop = QApplication::desktop();
+        int size = m_panels.size();
         Unity2dPanel* panel;
-        if (i < size) {
-            panel = m_panels[i];
+
+        /* The first panel is always the one on the leftmost screen. */
+        int leftmost = desktop->screenNumber(QPoint());
+        if (size > 0) {
+            panel = m_panels[0];
         } else {
-            panel = instantiatePanel(i);
+            panel = instantiatePanel(leftmost);
             m_panels.append(panel);
         }
         panel->show();
-        panel->move(desktop->screenGeometry(i).topLeft());
+        panel->move(desktop->screenGeometry(leftmost).topLeft());
+
+        /* Update the position of other existing panels, and instantiate new
+           panels as needed. */
+        int i = 1;
+        for (int screen = 0; screen < newCount; ++screen) {
+            if (screen == leftmost) {
+                continue;
+            }
+            if (i < size) {
+                panel = m_panels[i];
+            } else {
+                panel = instantiatePanel(screen);
+                m_panels.append(panel);
+            }
+            panel->show();
+            panel->move(desktop->screenGeometry(screen).topLeft());
+            ++i;
+        }
     }
     /* Remove extra panels if any. */
     while (m_panels.size() > newCount) {

=== modified file 'panel/applets/appname/appnameapplet.cpp'
--- panel/applets/appname/appnameapplet.cpp	2011-03-30 16:21:18 +0000
+++ panel/applets/appname/appnameapplet.cpp	2011-04-26 15:35:40 +0000
@@ -227,7 +227,7 @@
         );
     bool showLabel = !(isMaximized && showMenu) && isUserVisibleApp && isOnSameScreen;
 
-    d->m_windowButtonWidget->setVisible(isMaximized);
+    d->m_windowButtonWidget->setVisible(isOnSameScreen && isMaximized);
 
     d->m_label->setVisible(showLabel);
     if (showLabel) {