diff options
| author | Moonchild <moonchild@palemoon.org> | 2020-06-09 16:22:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-09 16:22:26 +0200 |
| commit | 907530e8669d40c1ff59c2855afcf669fe724263 (patch) | |
| tree | 40312a1ab94ab5e6a3d155e62136309ff4b5acfd /toolkit | |
| parent | ad6ce890dc38fe71df1c55958aed3128a711fb5a (diff) | |
| parent | d18faf81938c947f1d02feab2c394b8135f88d8f (diff) | |
| download | UXP-907530e8669d40c1ff59c2855afcf669fe724263.tar UXP-907530e8669d40c1ff59c2855afcf669fe724263.tar.gz UXP-907530e8669d40c1ff59c2855afcf669fe724263.tar.lz UXP-907530e8669d40c1ff59c2855afcf669fe724263.tar.xz UXP-907530e8669d40c1ff59c2855afcf669fe724263.zip | |
Merge pull request #1584 from Lootyhoof/global-menu
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 bb1a5eeee..43c529780 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 24a6713f9..0aa0d3a21 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"); } |