Bug 258285. Findbar coming up when it shouldn't (textareas/textfields). r=mats, sr=bryner, a=asa

git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@177875 18797224-902f-48f8-a5cc-f745e15eee43
2005-08-16 19:33:48 +00:00
parent dfff2b57ba
commit 68e7466914
3 changed files with 63 additions and 45 deletions
--- a/mozilla/xpfe/appshell/src/nsWebShellWindow.cpp
+++ b/mozilla/xpfe/appshell/src/nsWebShellWindow.cpp
@@ -483,11 +483,15 @@ nsWebShellWindow::HandleEvent(nsGUIEvent *aEvent)
            // on eventWindow. -bryner
            nsCOMPtr<nsIXULWindow> kungFuDeathGrip(eventWindow);

-            focusController->SetSuppressFocus(PR_TRUE, "Activation Suppression");
-
            nsCOMPtr<nsIDOMWindowInternal> domWindow = 
              do_QueryInterface(piWin);

+            if (domWindow == focusedWindow) {
+              break; // Already focused
+            }
+
+            focusController->SetSuppressFocus(PR_TRUE, "Activation Suppression");
+
            NS_ASSERTION(domWindow,
                         "windows must support nsIDOMWindowInternal");