diff options
| -rw-r--r-- | base/content/browser-menubar.inc | 4 | ||||
| -rwxr-xr-x | base/content/browser.js | 4 | ||||
| -rw-r--r-- | components/places/content/places.xul | 4 |
3 files changed, 12 insertions, 0 deletions
diff --git a/base/content/browser-menubar.inc b/base/content/browser-menubar.inc index 702c5ec..04e4634 100644 --- a/base/content/browser-menubar.inc +++ b/base/content/browser-menubar.inc @@ -5,7 +5,11 @@ <menubar id="main-menubar" onpopupshowing="if (event.target.parentNode.parentNode == this && +#ifdef MOZ_WIDGET_GTK + document.documentElement.getAttribute('shellshowingmenubar') != 'true') +#else !('@mozilla.org/widget/nativemenuservice;1' in Cc)) +#endif this.setAttribute('openedwithkey', event.target.parentNode.openedWithKey);" style="border:0px;padding:0px;margin:0px;-moz-appearance:none"> diff --git a/base/content/browser.js b/base/content/browser.js index 22838d1..352f5e6 100755 --- a/base/content/browser.js +++ b/base/content/browser.js @@ -4708,6 +4708,10 @@ function getTogglableToolbars() { let toolbarNodes = Array.slice(gNavToolbox.childNodes); toolbarNodes = toolbarNodes.concat(gNavToolbox.externalToolbars); toolbarNodes = toolbarNodes.filter(node => node.getAttribute("toolbarname")); +#ifdef MOZ_WIDGET_GTK + if (document.documentElement.getAttribute("shellshowingmenubar") == "true") + toolbarNodes = toolbarNodes.filter(node => node.id != "toolbar-menubar"); +#endif return toolbarNodes; } diff --git a/components/places/content/places.xul b/components/places/content/places.xul index 16c3385..6d2cdf1 100644 --- a/components/places/content/places.xul +++ b/components/places/content/places.xul @@ -157,7 +157,11 @@ <toolbarbutton type="menu" class="tabbable" onpopupshowing="document.getElementById('placeContent').focus()" #else +#ifdef MOZ_WIDGET_GTK + <menubar id="placesMenu" _moz-menubarkeeplocal="true"> +#else <menubar id="placesMenu"> +#endif <menu accesskey="&organize.accesskey;" class="menu-iconic" #endif id="organizeButton" label="&organize.label;" |