From fbf4d622722d0b632b7f2d596fe32507f23aa385 Mon Sep 17 00:00:00 2001
From: Markus Stange <mstange@themasta.com>
Date: Fri, 14 May 2010 12:20:00 +0200
Subject: [PATCH] Bug 549562 - Position the toolbar customization popup in
 repositionDialog() and make it invisible until it's positioned and loaded.
 r=gavin

---
 browser/base/content/browser.js               | 13 ++++++++---
 browser/base/content/browser.xul              |  3 +--
 .../base/content/test/browser_customize.js    | 22 +++++++++++++++----
 toolkit/content/customizeToolbar.js           | 14 ++++++++----
 4 files changed, 39 insertions(+), 13 deletions(-)

diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index a480f70de2cb..1ab1fedd6f9d 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -3310,8 +3310,10 @@ function BrowserCustomizeToolbar()
 
   if (gCustomizeSheet) {
     var sheetFrame = document.getElementById("customizeToolbarSheetIFrame");
+    var panel = document.getElementById("customizeToolbarSheetPopup");
     sheetFrame.hidden = false;
     sheetFrame.toolbox = gNavToolbox;
+    sheetFrame.panel = panel;
 
     // The document might not have been loaded yet, if this is the first time.
     // If it is already loaded, reload it so that the onload initialization code
@@ -3321,9 +3323,14 @@ function BrowserCustomizeToolbar()
     else
       sheetFrame.setAttribute("src", customizeURL);
 
-    document.getElementById("customizeToolbarSheetPopup")
-            .openPopup(gNavToolbox, "after_start", 0, 0);
-
+    // Open the panel, but make it invisible until the iframe has loaded so
+    // that the user doesn't see a white flash.
+    panel.style.visibility = "hidden";
+    gNavToolbox.addEventListener("beforecustomization", function () {
+      gNavToolbox.removeEventListener("beforecustomization", arguments.callee, false);
+      panel.style.removeProperty("visibility");
+    }, false);
+    panel.openPopup(gNavToolbox, "after_start", 0, 0);
     return sheetFrame.contentWindow;
   } else {
     return window.openDialog(customizeURL,
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index 7dd4afec4e54..25d310a16f1d 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -375,8 +375,7 @@
     <tooltip id="bhTooltip"/>
 
     <panel id="customizeToolbarSheetPopup"
-           noautohide="true"
-           onpopupshown="this.moveTo(this.boxObject.screenX + (window.innerWidth - this.boxObject.width) / 2, this.boxObject.screenY);">
+           noautohide="true">
       <iframe id="customizeToolbarSheetIFrame"
               style="&dialog.style;"
               hidden="true"/>
diff --git a/browser/base/content/test/browser_customize.js b/browser/base/content/test/browser_customize.js
index 7908b74c6033..c719bfbace8a 100644
--- a/browser/base/content/test/browser_customize.js
+++ b/browser/base/content/test/browser_customize.js
@@ -29,15 +29,29 @@ function testCustomizeFrameLoaded()
   }
 
   var framedoc = document.getElementById("customizeToolbarSheetIFrame").contentDocument;
-  var b = framedoc.getElementById("donebutton");
 
-  b.focus();
-  framedoc.getElementById("donebutton").doCommand();
+  var panelX = panel.boxObject.screenX;
+  var iconModeList = framedoc.getElementById("modelist");
+  iconModeList.addEventListener("popupshown", function (e) {
+    iconModeList.removeEventListener("popupshown", arguments.callee, false);
+    SimpleTest.executeSoon(function () {
+      is(panel.boxObject.screenX, panelX, "toolbar customization panel shouldn't move when the iconmode menulist is opened");
+      iconModeList.open = false;
+    
+      var b = framedoc.getElementById("donebutton");
+      b.focus();
+      b.doCommand();
+    });
+  }, false);
+  iconModeList.open = true;
 }
   
-function testCustomizePopupHidden()
+function testCustomizePopupHidden(e)
 {
   var panel = document.getElementById("customizeToolbarSheetPopup");
+  if (e.target != panel)
+    return;
+
   panel.removeEventListener("popuphidden", testCustomizePopupHidden, false);
   is(document.activeElement, document.documentElement, "focus after customize done");
 
diff --git a/toolkit/content/customizeToolbar.js b/toolkit/content/customizeToolbar.js
index 286d1c8b3423..a0c7183668a3 100644
--- a/toolkit/content/customizeToolbar.js
+++ b/toolkit/content/customizeToolbar.js
@@ -50,12 +50,13 @@ function onLoad()
 {
   if ("arguments" in window && window.arguments[0]) {
     InitWithToolbox(window.arguments[0]);
-    repositionDialog();
+    repositionDialog(window);
   }
   else if (window.frameElement &&
            "toolbox" in window.frameElement) {
     gToolboxSheet = true;
     InitWithToolbox(window.frameElement.toolbox);
+    repositionDialog(window.frameElement.panel);
   }
 }
 
@@ -114,12 +115,17 @@ function initDialog()
   wrapToolbarItems();
 }
 
-function repositionDialog()
+function repositionDialog(aWindow)
 {
   // Position the dialog touching the bottom of the toolbox and centered with
   // it.
+  if (!aWindow)
+    return;
+
   var width;
-  if (document.documentElement.hasAttribute("width"))
+  if (aWindow != window)
+    width = aWindow.getBoundingClientRect().width;
+  else if (document.documentElement.hasAttribute("width"))
     width = document.documentElement.getAttribute("width");
   else
     width = parseInt(document.documentElement.style.width);
@@ -127,7 +133,7 @@ function repositionDialog()
                 + ((gToolbox.boxObject.width - width) / 2);
   var screenY = gToolbox.boxObject.screenY + gToolbox.boxObject.height;
 
-  window.moveTo(screenX, screenY);
+  aWindow.moveTo(screenX, screenY);
 }
 
 function removeToolboxListeners()