Merge lp:~mconley/globalmenu-extension/open_on_f10_and_add_CanOpen_705924_and_716537 into lp:globalmenu-extension

[Mike Conley]

I've added a CanOpen check to uGlobalMenu to ensure that a menu *can* be opened (is visible, is sensitive) before opening it.

=== modified file 'extensions/globalmenu/components/src/uGlobalMenu.cpp'
--- extensions/globalmenu/components/src/uGlobalMenu.cpp	2011-02-13 22:54:50 +0000
+++ extensions/globalmenu/components/src/uGlobalMenu.cpp	2011-02-14 15:06:38 +0000
@@ -138,9 +138,28 @@
   }
 }
 
+PRBool
+uGlobalMenu::CanOpen()
+{
+    PRBool isHidden = mContent->AttrValueIs(kNameSpaceID_None,
+                                           uWidgetAtoms::hidden,
+                                           uWidgetAtoms::_true,
+                                           eCaseMatters);
+    PRBool isDisabled = mContent->AttrValueIs(kNameSpaceID_None,
+                                             uWidgetAtoms::disabled,
+                                             uWidgetAtoms::_true,
+                                             eCaseMatters);
+
+    return (!isHidden && !isDisabled);
+}
+
 void
 uGlobalMenu::OnOpen()
 {
+  if (!CanOpen()) {
+    return;
+  }
+
   Activate();
 
   mContent->SetAttr(kNameSpaceID_None, uWidgetAtoms::open, NS_LITERAL_STRING("true"), PR_TRUE);

=== modified file 'extensions/globalmenu/components/src/uGlobalMenu.h'
--- extensions/globalmenu/components/src/uGlobalMenu.h	2011-02-07 15:27:54 +0000
+++ extensions/globalmenu/components/src/uGlobalMenu.h	2011-02-14 15:06:38 +0000
@@ -88,6 +88,7 @@
   void GetMenuPopupFromMenu (nsIContent **aResult);
   static PRBool MenuOpenCallback (DbusmenuMenuitem *menu,
                                   void *data);
+  PRBool CanOpen ();
   void OnOpen ();
   void Activate ();
   void Deactivate ();

=== modified file 'extensions/globalmenu/components/src/uGlobalMenuBar.cpp'
--- extensions/globalmenu/components/src/uGlobalMenuBar.cpp	2011-02-04 23:49:41 +0000
+++ extensions/globalmenu/components/src/uGlobalMenuBar.cpp	2011-02-14 15:06:38 +0000
@@ -340,7 +340,11 @@
 
   nsCOMPtr<nsIDOMKeyEvent> keyEvent = do_QueryInterface(aKeyEvent);
   uGlobalMenuObject *found = nsnull;
+  PRUint32 keyCode = nsnull;
+
   if (keyEvent) {
+    keyEvent->GetKeyCode(&keyCode);
+    PRUint32 count = mMenuObjects.Length();
     PRUint32 modifiers = GetModifiersFromEvent(keyEvent);
     if ((modifiers & mAccessKeyMask) && ((modifiers & ~mAccessKeyMask) == 0)) {
       // The menu access modifier is pressed
@@ -361,7 +365,6 @@
         ToLowerCase(cCharCode, lowerCaseCode);
         CopyUTF8toUTF16(lowerCaseCode, aCharCode);
         ch = *aCharCode.BeginWriting();
-        PRUint32 count = mMenuObjects.Length();
         PRUint32 i;
         for (i = 0; i < count; i++) {
           nsCOMPtr<nsIContent> content;
@@ -378,10 +381,21 @@
             if (*key == ch) {
               found = mMenuObjects[i];
               break;
-            }            
+            }
           }
         }
       }
+    } else if (keyCode == nsIDOMKeyEvent::DOM_VK_F10) {
+      // Go through each mMenuObject, and find the first one
+      // that is both visible and sensitive, and mark it found
+      // for opening.
+      for (PRUint32 i = 0; i < count; i++) {
+        uGlobalMenu *menu = static_cast<uGlobalMenu *>((uGlobalMenuObject *)mMenuObjects[i]);
+        if (menu->CanOpen()) {
+          found = mMenuObjects[i];
+          break;
+        }
+      }
     }
   }