diff options
| author | Lootyhoof <lootyhoofer@gmail.com> | 2020-06-06 00:37:29 +0100 |
|---|---|---|
| committer | Lootyhoof <lootyhoofer@gmail.com> | 2020-06-09 13:41:53 +0100 |
| commit | d18faf81938c947f1d02feab2c394b8135f88d8f (patch) | |
| tree | 17ad9c1ecb14acd726cb8404c3a82e2781e27253 /toolkit | |
| parent | fdb918dea124a6efaf0c86f6d5c2ab1b83013e40 (diff) | |
| download | uxp-d18faf81938c947f1d02feab2c394b8135f88d8f.tar.gz | |
Issue MoonchildProductions/UXP#1578 - Add global menubar support for GTK
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/content/widgets/popup.xml | 10 | ||||
| -rw-r--r-- | toolkit/content/xul.css | 9 |
2 files changed, 17 insertions, 2 deletions
diff --git a/toolkit/content/widgets/popup.xml b/toolkit/content/widgets/popup.xml index bb1a5eeee8..43c529780f 100644 --- a/toolkit/content/widgets/popup.xml +++ b/toolkit/content/widgets/popup.xml @@ -25,8 +25,14 @@ </getter> </property> - <property name="state" readonly="true" - onget="return this.popupBoxObject.popupState"/> + <property name="state" readonly="true"> + <getter><![CDATA[ + if (this.hasAttribute('_moz-nativemenupopupstate')) + return this.getAttribute('_moz-nativemenupopupstate'); + else + return this.popupBoxObject.popupState; + ]]></getter> + </property> <property name="triggerNode" readonly="true" onget="return this.popupBoxObject.triggerNode"/> diff --git a/toolkit/content/xul.css b/toolkit/content/xul.css index 24a6713f9b..0aa0d3a217 100644 --- a/toolkit/content/xul.css +++ b/toolkit/content/xul.css @@ -307,6 +307,15 @@ toolbar[type="menubar"][autohide="true"][inactive="true"]:not([customizing="true } %endif +%ifdef MOZ_WIDGET_GTK +window[shellshowingmenubar="true"] menubar, +window[shellshowingmenubar="true"] +toolbar[type="menubar"]:not([customizing="true"]) { + /* If a system-wide global menubar is in use, hide the XUL menubar. */ + display: none !important; +} +%endif + toolbarseparator { -moz-binding: url("chrome://global/content/bindings/toolbar.xml#toolbardecoration"); } |