From 6235023c8bff80273981c70a06cb9decb4a4ffa5 Mon Sep 17 00:00:00 2001
From: Lootyhoof <lootyhoofer@gmail.com>
Date: Sat, 6 Jun 2020 00:37:29 +0100
Subject: Issue MoonchildProductions/UXP#1578 - Add global menubar support for
 GTK

---
 toolkit/content/widgets/popup.xml | 10 ++++++++--
 toolkit/content/xul.css           |  9 +++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

(limited to 'toolkit/content')

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");
 }
-- 
cgit v1.2.3


From 7f238b1cf9775b43b119eb9a5e2ea0fe79fa5add Mon Sep 17 00:00:00 2001
From: "Matt A. Tobin" <email@mattatobin.com>
Date: Tue, 9 Jun 2020 10:42:36 -0400
Subject: Follow up to Issue #1578 - Preprocess the popup binding

---
 toolkit/content/jar.mn            |  2 +-
 toolkit/content/widgets/popup.xml | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

(limited to 'toolkit/content')

diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
index 8b7b35b61..d79403605 100644
--- a/toolkit/content/jar.mn
+++ b/toolkit/content/jar.mn
@@ -96,7 +96,7 @@ toolkit.jar:
    content/global/bindings/menulist.xml        (widgets/menulist.xml)
    content/global/bindings/notification.xml    (widgets/notification.xml)
    content/global/bindings/numberbox.xml       (widgets/numberbox.xml)
-   content/global/bindings/popup.xml           (widgets/popup.xml)
+*  content/global/bindings/popup.xml           (widgets/popup.xml)
 *  content/global/bindings/preferences.xml     (widgets/preferences.xml)
    content/global/bindings/progressmeter.xml   (widgets/progressmeter.xml)
    content/global/bindings/radio.xml           (widgets/radio.xml)
diff --git a/toolkit/content/widgets/popup.xml b/toolkit/content/widgets/popup.xml
index 43c529780..c8a395c40 100644
--- a/toolkit/content/widgets/popup.xml
+++ b/toolkit/content/widgets/popup.xml
@@ -25,14 +25,21 @@
         </getter>
       </property>
 
+#ifdef MOZ_WIDGET_GTK
       <property name="state" readonly="true">
-        <getter><![CDATA[
+        <getter>
+        <![CDATA[
           if (this.hasAttribute('_moz-nativemenupopupstate'))
             return this.getAttribute('_moz-nativemenupopupstate');
           else
             return this.popupBoxObject.popupState;
-        ]]></getter>
+        ]]>
+        </getter>
       </property>
+#else
+      <property name="state" readonly="true"
+                onget="return this.popupBoxObject.popupState"/>
+#endif
 
       <property name="triggerNode" readonly="true"
                 onget="return this.popupBoxObject.triggerNode"/>
-- 
cgit v1.2.3