From f6f3381989bfad21cbef3b91f2f238a3b0e8b710 Mon Sep 17 00:00:00 2001
From: "neil@parkwaycc.co.uk" <neil@parkwaycc.co.uk>
Date: Fri, 9 Nov 2007 06:06:28 -0800
Subject: [PATCH] Bug 397873 Popup windows have menu bar when they used not to
 r=gavin a=sayrer

---
 toolkit/content/widgets/toolbar.xml |  5 +++++
 toolkit/content/xul.css             | 10 ++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/toolkit/content/widgets/toolbar.xml b/toolkit/content/widgets/toolbar.xml
index 6f030c2dc8b9..4fd58d14d1e4 100644
--- a/toolkit/content/widgets/toolbar.xml
+++ b/toolkit/content/widgets/toolbar.xml
@@ -70,6 +70,11 @@
   </binding>
   
   <binding id="toolbar" extends="chrome://global/content/bindings/toolbar.xml#toolbar-base">
+    <content>
+      <xul:hbox flex="1">
+        <children/>
+      </xul:hbox>
+    </content>
     <implementation implements="nsIAccessibleProvider">
       <property name="accessibleType" readonly="true">
         <getter>
diff --git a/toolkit/content/xul.css b/toolkit/content/xul.css
index f2e7a1cee79d..c7f83d78e88e 100644
--- a/toolkit/content/xul.css
+++ b/toolkit/content/xul.css
@@ -264,10 +264,12 @@ window[chromehidden~="menubar"] .chromeclass-menubar,
 menubar[hidden="true"],
 menubar[moz-collapsed="true"],
 menubar[collapsed="true"] {
-  min-height: 0%;
-  max-height: 0px;
-  display: -moz-box;
-  visibility: visible;
+  min-height: 0% !important;
+  max-height: 0px !important;
+  display: -moz-box !important;
+  visibility: visible !important;
+  -moz-box-orient: vertical !important;
+  -moz-box-pack: end !important;
 }
 
 /********* menu ***********/