From eabc5a74e9a4bc65f9a4cc5febfef4ef808b7c37 Mon Sep 17 00:00:00 2001
From: "neil@parkwaycc.co.uk" <neil@parkwaycc.co.uk>
Date: Mon, 17 Sep 2007 15:12:51 -0700
Subject: [PATCH] Try to avoid really hiding menus b=127244 r=gavin a=mconnor

---
 toolkit/content/widgets/toolbar.xml |  5 +++++
 toolkit/content/xul.css             | 12 +++++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/toolkit/content/widgets/toolbar.xml b/toolkit/content/widgets/toolbar.xml
index c660df05e00..e8a73e2dcb0 100644
--- a/toolkit/content/widgets/toolbar.xml
+++ b/toolkit/content/widgets/toolbar.xml
@@ -267,6 +267,11 @@
   </binding>
 
   <binding id="menubar" extends="chrome://global/content/bindings/toolbar.xml#toolbar-base" display="xul:menubar">
+    <content height="0">
+      <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 8bd0d9dc80a..4fb39b6e054 100644
--- a/toolkit/content/xul.css
+++ b/toolkit/content/xul.css
@@ -33,7 +33,6 @@
    :: kinds of windows (not JUST browser windows) with toolbars
    ::::: */
 
-window[chromehidden~="menubar"] .chromeclass-menubar,
 window[chromehidden~="directories"] .chromeclass-directories,
 window[chromehidden~="status"] .chromeclass-status,
 window[chromehidden~="extrachrome"] .chromeclass-extrachrome,
@@ -255,6 +254,17 @@ toolbarpaletteitem[place="palette"] {
 
 menubar {
   -moz-binding: url("chrome://global/content/bindings/toolbar.xml#menubar");
+  -moz-box-orient: vertical;
+  -moz-box-pack: end;
+}
+
+window[chromehidden~="menubar"] .chromeclass-menubar,
+menubar[hidden="true"],
+menubar[_moz_collapsed="true"],
+menubar[collapsed="true"] {
+  min-height: 0%;
+  display: -moz-box;
+  visibility: visible;
 }
 
 /********* menu ***********/