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

[Florian Boucault]

[panel] Force window buttons to have a fixed width and to be left aligned.

[Florian Boucault (fboucault)]

The bug is easy to reproduce by programmatically removing the m_label and m_menuBarWidget from AppNameApplet.

[lp:~fboucault/unity-2d/window_buttons_left_aligned_and_fixed_width]

448. By Florian Boucault on 2011-03-13

Forgotten change.

[Aurélien Gâteau (agateau)]

Good catch.

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:04:11 +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);
@@ -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);