Merge lp:~gerboland/unity-2d/panel-f10-keyboard-navigation-fixes into lp:unity-2d/3.0

[Gerry Boland]

[panel] F10 shortcut now correctly displays menu for keyboard navigation. Menubar displays when menus are open, and vanishes when menus close.

[lp:~gerboland/unity-2d/panel-f10-keyboard-navigation-fixes]

635. By Gerry Boland on 2011-07-25

Fixes F10 menu displaybug, where menu didn't obtain focus and panel covered menubar.

[Florian Boucault (fboucault)]

Bug is fixed and panel works properly :)

panel/applets/appname/menubarwidget.h:
[...]
/**
 * An helper class which monitors the menubar and emits MenuBarWidget::menuBarClosed()
 * to indiciate if the menu was closed or updated.
 */

has a spelling mistake: "indiciate"

Otherwise the patch looks good.

review: Approve

[lp:~gerboland/unity-2d/panel-f10-keyboard-navigation-fixes]

636. By Gerry Boland on 2011-07-25

Fixed typo "indiciate" -> "indicate"

=== modified file 'panel/applets/appname/appnameapplet.cpp'
--- panel/applets/appname/appnameapplet.cpp	2011-06-21 16:03:12 +0000
+++ panel/applets/appname/appnameapplet.cpp	2011-07-25 13:37:28 +0000
@@ -203,7 +203,7 @@
     void setupMenuBarWidget()
     {
         m_menuBarWidget = new MenuBarWidget(0 /* Window menu */);
-        QObject::connect(m_menuBarWidget, SIGNAL(menuBarClosed()),
+        QObject::connect(m_menuBarWidget, SIGNAL(menuBarChanged()),
             q, SLOT(updateWidgets()));
         QObject::connect(m_menuBarWidget, SIGNAL(isEmptyChanged()),
             q, SLOT(updateWidgets()));

=== modified file 'panel/applets/appname/menubarwidget.cpp'
--- panel/applets/appname/menubarwidget.cpp	2011-07-13 09:00:33 +0000
+++ panel/applets/appname/menubarwidget.cpp	2011-07-25 13:37:28 +0000
@@ -62,6 +62,7 @@
 MenuBarWidget::MenuBarWidget(QMenu* windowMenu, QWidget* parent)
 : QWidget(parent)
 , m_windowMenu(windowMenu)
+, m_isMenuOpen(false)
 {
     m_activeWinId = 0;
     setupRegistrar();
@@ -93,7 +94,7 @@
 void MenuBarWidget::setupMenuBar()
 {
     m_menuBar = new QMenuBar;
-    new MenuBarClosedHelper(this);
+    m_menuBarMonitor = new MenuBarClosedHelper(this);
 
     QHBoxLayout* layout = new QHBoxLayout(this);
     layout->setMargin(0);
@@ -111,6 +112,9 @@
     // is drawn or not
     connect(KeyboardModifiersMonitor::instance(), SIGNAL(keyboardModifiersChanged(Qt::KeyboardModifiers)),
         m_menuBar, SLOT(update()));
+
+    // Watch when the menubar's menus close so that it can be hidden
+    connect(m_menuBarMonitor, SIGNAL(menuBarClosed()), SLOT(slotMenuBarClosed()));
 }
 
 void MenuBarWidget::slotActiveWindowChanged(BamfWindow* /*former*/, BamfWindow* current)
@@ -169,10 +173,18 @@
     DBusMenuImporter* importer = static_cast<DBusMenuImporter*>(sender());
 
     if (m_importers.value(m_activeWinId) == importer) {
+        m_isMenuOpen = true;
+        Q_EMIT menuBarChanged();
         m_menuBar->setActiveAction(action);
     }
 }
 
+void MenuBarWidget::slotMenuBarClosed()
+{
+    m_isMenuOpen = false;
+    Q_EMIT menuBarChanged();
+}
+
 QMenu* MenuBarWidget::menuForWinId(WId wid) const
 {
     MyDBusMenuImporter* importer = m_importers.value(wid);
@@ -245,7 +257,7 @@
 
 bool MenuBarWidget::isOpened() const
 {
-    return m_menuBar->activeAction();
+    return m_isMenuOpen;
 }
 
 // MenuBarClosedHelper ----------------------------------------
@@ -283,8 +295,9 @@
 
 void MenuBarClosedHelper::emitMenuBarClosed()
 {
+    //If there is still no menu action active, then menu must be closed.
     if (!m_widget->m_menuBar->activeAction()) {
-        QMetaObject::invokeMethod(m_widget, "menuBarClosed");
+        Q_EMIT menuBarClosed();
     }
 }
 

=== modified file 'panel/applets/appname/menubarwidget.h'
--- panel/applets/appname/menubarwidget.h	2011-04-13 21:17:38 +0000
+++ panel/applets/appname/menubarwidget.h	2011-07-25 13:37:28 +0000
@@ -43,7 +43,7 @@
 
 /**
  * An helper class which monitors the menubar and emits MenuBarWidget::menuBarClosed()
- * when necessary
+ * to indicate if the menu was closed or updated.
  */
 class MenuBarClosedHelper : public QObject
 {
@@ -51,6 +51,9 @@
 public:
     MenuBarClosedHelper(MenuBarWidget*);
 
+Q_SIGNALS:
+    void menuBarClosed();
+
 protected:
     bool eventFilter(QObject*, QEvent*); //reimp
 
@@ -72,7 +75,7 @@
     bool isOpened() const;
 
 Q_SIGNALS:
-    void menuBarClosed();
+    void menuBarChanged();
     void isEmptyChanged();
 
 protected:
@@ -85,17 +88,20 @@
     void slotWindowUnregistered(WId);
     void slotMenuUpdated();
     void slotActionActivationRequested(QAction* action);
+    void slotMenuBarClosed();
     void updateMenuBar();
 
 private:
     Q_DISABLE_COPY(MenuBarWidget)
 
     QMenuBar* m_menuBar;
+    MenuBarClosedHelper* m_menuBarMonitor;
     Registrar* m_registrar;
     ImporterForWId m_importers;
     WId m_activeWinId;
     QMenu* m_windowMenu;
     QTimer* m_updateMenuBarTimer;
+    bool m_isMenuOpen;
 
     void setupRegistrar();
     void setupMenuBar();