[patch] patch to fix erratic popup behaviour

popup-fix.patch (text/plain), 2.62 KB, created by Max Arnold on 2009-02-21 03:45:13 UTC

diff -Naur mozilla.orig/layout/base/nsCaret.cpp mozilla/layout/base/nsCaret.cpp
--- mozilla.orig/layout/base/nsCaret.cpp	2008-07-22 19:59:14.000000000 +0800
+++ mozilla/layout/base/nsCaret.cpp	2009-02-20 22:58:20.000000000 +0700
@@ -1018,7 +1018,7 @@
 {
   // Check if there are open popups.
   nsXULPopupManager *popMgr = nsXULPopupManager::GetInstance();
-  nsTArray<nsIFrame*> popups = popMgr->GetOpenPopups();
+  nsTArray<nsIFrame*> popups = popMgr->GetVisiblePopups();
 
   if (popups.Length() == 0)
     return PR_FALSE; // No popups, so caret can't be hidden by them.
diff -Naur mozilla.orig/layout/base/nsPresShell.cpp mozilla/layout/base/nsPresShell.cpp
--- mozilla.orig/layout/base/nsPresShell.cpp	2009-01-08 06:23:40.000000000 +0700
+++ mozilla/layout/base/nsPresShell.cpp	2009-02-20 22:59:13.000000000 +0700
@@ -5633,7 +5633,7 @@
 #ifdef MOZ_XUL
       nsXULPopupManager* pm = nsXULPopupManager::GetInstance();
       if (pm) {
-        nsTArray<nsIFrame*> popups = pm->GetOpenPopups();
+        nsTArray<nsIFrame*> popups = pm->GetVisiblePopups();
         PRUint32 i;
         // Search from top to bottom
         for (i = 0; i < popups.Length(); i++) {
diff -Naur mozilla.orig/layout/xul/base/public/nsXULPopupManager.h mozilla/layout/xul/base/public/nsXULPopupManager.h
--- mozilla.orig/layout/xul/base/public/nsXULPopupManager.h	2008-04-24 05:25:34.000000000 +0800
+++ mozilla/layout/xul/base/public/nsXULPopupManager.h	2009-02-20 23:02:03.000000000 +0700
@@ -503,10 +503,10 @@
   nsIFrame* GetTopPopup(nsPopupType aType);
 
   /**
-   * Return an array of all the open popup frames for menus, in order from
-   * top to bottom.
+   * Return an array of all the open and visible popup frames for menus, 
+   * in order from top to bottom.
    */
-  nsTArray<nsIFrame *> GetOpenPopups();
+  nsTArray<nsIFrame *> GetVisiblePopups();
 
   /**
    * Return false if a popup may not be opened. This will return false if the
diff -Naur mozilla.orig/layout/xul/base/src/nsXULPopupManager.cpp mozilla/layout/xul/base/src/nsXULPopupManager.cpp
--- mozilla.orig/layout/xul/base/src/nsXULPopupManager.cpp	2008-04-24 05:25:35.000000000 +0800
+++ mozilla/layout/xul/base/src/nsXULPopupManager.cpp	2009-02-20 23:03:40.000000000 +0700
@@ -1168,13 +1168,13 @@
 }
 
 nsTArray<nsIFrame *>
-nsXULPopupManager::GetOpenPopups()
+nsXULPopupManager::GetVisiblePopups()
 {
   nsTArray<nsIFrame *> popups;
 
   nsMenuChainItem* item = mCurrentMenu;
   while (item) {
-    if (item->Frame()->PopupState() != ePopupInvisible)
+    if (item->Frame()->PopupState() == ePopupOpenAndVisible)
       popups.AppendElement(static_cast<nsIFrame*>(item->Frame()));
     item = item->GetParent();
   }