Merge lp:~fboucault/unity-2d/fix_indicators_pushed_off_screen into lp:unity-2d/3.0

[Florian Boucault]

[panel] Make sure long menus do not push indicators off screen.

[Florian Boucault (fboucault)]

This MR needs to be reviewed after https://code.launchpad.net/~fboucault/unity-2d/window_buttons_left_aligned_and_fixed_width/+merge/53155.

The branch in this MR was branched from the one in the other merge request.

[Florian Boucault (fboucault)]

Visual result with this patch: http://people.canonical.com/~kaleo/unity/long_menus.png

[Aurélien Gâteau (agateau)]

Looks good.

review: Approve

=== modified file 'panel/applets/appname/appnameapplet.cpp'
--- panel/applets/appname/appnameapplet.cpp	2011-01-15 01:41:03 +0000
+++ panel/applets/appname/appnameapplet.cpp	2011-03-13 03:55:53 +0000
@@ -144,6 +144,7 @@
     void setupWindowButtonWidget()
     {
         m_windowButtonWidget = new QWidget;
+        m_windowButtonWidget->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Minimum);
         QHBoxLayout* layout = new QHBoxLayout(m_windowButtonWidget);
         layout->setContentsMargins(0, 0, WINDOW_BUTTONS_RIGHT_MARGIN, 0);
         layout->setSpacing(0);
@@ -187,7 +188,7 @@
 : d(new AppNameAppletPrivate)
 {
     d->q = this;
-    setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum);
+    setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Minimum);
 
     d->setupWindowHelper();
     d->setupLabel();
@@ -198,7 +199,7 @@
     QHBoxLayout* layout = new QHBoxLayout(this);
     layout->setMargin(0);
     layout->setSpacing(0);
-    layout->addWidget(d->m_windowButtonWidget);
+    layout->addWidget(d->m_windowButtonWidget, 0, Qt::AlignLeft);
     layout->addWidget(d->m_label);
     layout->addWidget(d->m_menuBarWidget);