Merge lp:~osomon/unity-2d/panel-update-on-view-opened into lp:unity-2d/3.0

[Olivier Tilloy]

[panel] Update the appname applet’s information (application name, window buttons, menu bar) also when a new view is opened.

This works around a bug in BAMF whereby the ActiveWindowChanged signal is not emitted for some windows that open maximized. This is for example the case of the LibreOffice startcenter..

[Ugo Riboni (uriboni)]

I tested it functionally and it works fine with both libreoffice and other applications that are made to start maximized.
I also checked for regressions with other apps and window sizes and it all seems ok.

Looking at the code I don't see how it would cause regressions anyway. At worse what it might do is cause unnecessary updates.

I don't have comments about the code either, it seems good to go.
Well done.

review: Approve

=== modified file 'panel/applets/appname/menubarwidget.cpp'
--- panel/applets/appname/menubarwidget.cpp	2011-04-01 17:04:43 +0000
+++ panel/applets/appname/menubarwidget.cpp	2011-04-13 21:29:45 +0000
@@ -69,6 +69,11 @@
 
     connect(&BamfMatcher::get_default(), SIGNAL(ActiveWindowChanged(BamfWindow*, BamfWindow*)),
         SLOT(slotActiveWindowChanged(BamfWindow*, BamfWindow*)));
+    /* Work around a bug in BAMF: the ActiveWindowChanged signal is not emitted
+       for some windows that open maximized. This is for example the case of the
+       LibreOffice startcenter. */
+    connect(&BamfMatcher::get_default(), SIGNAL(ViewOpened(BamfView*)),
+        SLOT(slotViewOpened()));
     updateActiveWinId(BamfMatcher::get_default().active_window());
 }
 
@@ -121,6 +126,19 @@
     }
 }
 
+void MenuBarWidget::slotViewOpened()
+{
+    BamfWindow* active = BamfMatcher::get_default().active_window();
+    if (active != NULL) {
+        if (active->xid() != m_activeWinId) {
+            /* This shouldn’t be needed as BAMF should have emitted the
+               ActiveWindowChanged signal, but it sometimes doesn’t (e.g. when
+               LibreOffice startcenter starts automatically maximized). */
+            updateActiveWinId(active);
+        }
+    }
+}
+
 void MenuBarWidget::slotWindowRegistered(WId wid, const QString& service, const QDBusObjectPath& menuObjectPath)
 {
     MyDBusMenuImporter* importer = new MyDBusMenuImporter(service, menuObjectPath.path(), this);

=== modified file 'panel/applets/appname/menubarwidget.h'
--- panel/applets/appname/menubarwidget.h	2011-01-15 01:41:03 +0000
+++ panel/applets/appname/menubarwidget.h	2011-04-13 21:29:45 +0000
@@ -80,6 +80,7 @@
 
 private Q_SLOTS:
     void slotActiveWindowChanged(BamfWindow*, BamfWindow*);
+    void slotViewOpened();
     void slotWindowRegistered(WId, const QString& service, const QDBusObjectPath& menuObjectPath);
     void slotWindowUnregistered(WId);
     void slotMenuUpdated();

=== modified file 'panel/applets/appname/windowhelper.cpp'
--- panel/applets/appname/windowhelper.cpp	2011-03-30 16:21:18 +0000
+++ panel/applets/appname/windowhelper.cpp	2011-04-13 21:29:45 +0000
@@ -61,6 +61,11 @@
 
     connect(&BamfMatcher::get_default(), SIGNAL(ActiveWindowChanged(BamfWindow*,BamfWindow*)),
         SLOT(update()));
+    /* Work around a bug in BAMF: the ActiveWindowChanged signal is not emitted
+       for some windows that open maximized. This is for example the case of the
+       LibreOffice startcenter. */
+    connect(&BamfMatcher::get_default(), SIGNAL(ViewOpened(BamfView*)),
+        SLOT(update()));
     // Work around a BAMF bug: it does not emit ActiveWindowChanged when the
     // last window is closed. Should be removed when this bug is fixed.
     connect(&BamfMatcher::get_default(), SIGNAL(ViewClosed(BamfView*)),