From 89e24c4b3ad2b27bee435c6cbe26668345443173 Mon Sep 17 00:00:00 2001
From: Gijs Kruitbosch <gijskruitbosch@gmail.com>
Date: Thu, 16 May 2013 12:00:22 +0200
Subject: [PATCH] Bug 872578 - Customization shouldn't force a large window
 size, r=jaws

--HG--
extra : rebase_source : 0435554351130ce8b66ba72d345e4bbd77f7e332
---
 .../customizableui/content/customizeMode.inc.xul           | 4 ++--
 browser/components/customizableui/src/CustomizeMode.jsm    | 7 ++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/browser/components/customizableui/content/customizeMode.inc.xul b/browser/components/customizableui/content/customizeMode.inc.xul
index 11563b4297b0..eb6d46749cb3 100644
--- a/browser/components/customizableui/content/customizeMode.inc.xul
+++ b/browser/components/customizableui/content/customizeMode.inc.xul
@@ -2,7 +2,7 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<hbox id="customization-container" flex="1">
+<hbox id="customization-container" flex="1" hidden="true">
   <vbox flex="1" id="customization-palette-container">
     <label id="customization-header" value="&customizeMode.menuAndToolbars.header;"/>
     <vbox id="customization-palette" flex="1"/>
@@ -26,4 +26,4 @@
     </vbox>
     <spacer flex="1"/>
   </vbox>
-</hbox>
\ No newline at end of file
+</hbox>
diff --git a/browser/components/customizableui/src/CustomizeMode.jsm b/browser/components/customizableui/src/CustomizeMode.jsm
index f391079743d1..d045bb37b8e3 100644
--- a/browser/components/customizableui/src/CustomizeMode.jsm
+++ b/browser/components/customizableui/src/CustomizeMode.jsm
@@ -75,6 +75,9 @@ CustomizeMode.prototype = {
     let window = this.window;
     let document = this.document;
 
+    let customizer = document.getElementById("customization-container");
+    customizer.hidden = false;
+
     // We don't need to switch to kAboutURI, or open a new tab at
     // kAboutURI if we're already on it.
     if (this.browser.selectedBrowser.currentURI.spec != kAboutURI) {
@@ -105,7 +108,6 @@ CustomizeMode.prototype = {
     evt.initCustomEvent("CustomizationStart", true, true, window);
     window.dispatchEvent(evt);
 
-    let customizer = document.getElementById("customization-container");
     customizer.parentNode.selectedPanel = customizer;
 
     window.PanelUI.hide();
@@ -233,6 +235,9 @@ CustomizeMode.prototype = {
       }
     }
 
+    let customizer = document.getElementById("customization-container");
+    customizer.hidden = true;
+
     this._changed = false;
   },