Merge lp:~fboucault/unity-2d/panel_show_window_buttons_better into lp:unity-2d

[Florian Boucault]

[panel] Show window control buttons whenever the application menu is shown and the window is maximised.

=== modified file 'panel/applets/appname/appnameapplet.cpp'
--- panel/applets/appname/appnameapplet.cpp	2011-08-22 09:17:03 +0000
+++ panel/applets/appname/appnameapplet.cpp	2011-09-05 14:00:25 +0000
@@ -218,14 +218,16 @@
     bool isUserVisibleApp = app ? app->user_visible() : false;
     bool isOnSameScreen = d->m_windowHelper->isMostlyOnScreen(QApplication::desktop()->screenNumber(this));
     bool isUnderMouse = rect().contains(mapFromGlobal(QCursor::pos()));
-    bool showMenu = (!d->m_menuBarWidget->isEmpty() && isUserVisibleApp && isOnSameScreen)
-        && (isUnderMouse
+    bool isOpened = isOnSameScreen &&
+        (isUnderMouse
         || KeyboardModifiersMonitor::instance()->keyboardModifiers() == Qt::AltModifier
         || d->m_menuBarWidget->isOpened()
         );
+    bool showMenu = isOpened && !d->m_menuBarWidget->isEmpty() && isUserVisibleApp;
+    bool showWindowButtons = isOpened && isMaximized;
     bool showLabel = !(isMaximized && showMenu) && isUserVisibleApp && isOnSameScreen;
 
-    d->m_windowButtonWidget->setVisible(isOnSameScreen && isMaximized && isUnderMouse);
+    d->m_windowButtonWidget->setVisible(showWindowButtons);
 
     d->m_label->setVisible(showLabel);
     if (showLabel) {