From 3e30ae1797f99e229866f5362372aebeeb10ce68 Mon Sep 17 00:00:00 2001
From: windingwind <33902321+windingwind@users.noreply.github.com>
Date: Fri, 19 Apr 2024 19:32:50 +0800
Subject: [PATCH] Fix dialog window titlebar on macOS (#4011)

After #4010
---
 app/scripts/fetch_xulrunner                      | 3 ++-
 chrome/content/scaffold/load.xhtml               | 2 ++
 chrome/content/zotero/attachLink.xhtml           | 2 ++
 chrome/content/zotero/bibliography.xhtml         | 2 ++
 chrome/content/zotero/createParentDialog.xhtml   | 2 ++
 chrome/content/zotero/exportOptions.xhtml        | 2 ++
 chrome/content/zotero/feedSettings.xhtml         | 2 ++
 chrome/content/zotero/ingester/selectitems.xhtml | 2 ++
 chrome/content/zotero/longTagFixer.xhtml         | 2 ++
 chrome/content/zotero/newCollectionDialog.xhtml  | 2 ++
 chrome/content/zotero/searchDialog.xhtml         | 2 ++
 chrome/content/zotero/tagColorChooser.xhtml      | 2 ++
 12 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/app/scripts/fetch_xulrunner b/app/scripts/fetch_xulrunner
index 2b94c4deeb..56cba1c120 100755
--- a/app/scripts/fetch_xulrunner
+++ b/app/scripts/fetch_xulrunner
@@ -325,7 +325,7 @@ function modify_omni {
 	
 	# Import style into built-in dialogs
 	replace_line 'id=\"commonDialogWindow\"' \
-		'id=\"commonDialogWindow\" class=\"zotero-dialog\"' \
+		'id=\"commonDialogWindow\" class=\"zotero-dialog\" drawintitlebar-platforms=\"mac\"' \
 		chrome/toolkit/content/global/commonDialog.xhtml
 	replace_line '<\?xml-stylesheet href=\"chrome:\/\/global\/skin\/commonDialog.css\" type=\"text\/css\"\?>' \
 		'<\?xml-stylesheet href=\"chrome:\/\/global\/skin\/commonDialog.css\" type=\"text\/css\"\?>
@@ -337,6 +337,7 @@ function modify_omni {
 		try {
 			Services.dirsvc.get(\"ProfD\", Ci.nsIFile);
 			Services.scriptloader.loadSubScript(\"chrome:\/\/zotero\/content\/include.js\", this);
+			Services.scriptloader.loadSubScript(\"chrome:\/\/zotero\/content\/titlebar.js\", this);
 			Services.scriptloader.loadSubScript(\"chrome:\/\/zotero\/content\/customElements.js\", this);
 		} catch (e) {}' \
 		chrome/toolkit/content/global/commonDialog.xhtml
diff --git a/chrome/content/scaffold/load.xhtml b/chrome/content/scaffold/load.xhtml
index a161f08c9b..67e295dad8 100644
--- a/chrome/content/scaffold/load.xhtml
+++ b/chrome/content/scaffold/load.xhtml
@@ -32,12 +32,14 @@
 <window
 	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
 	title="&scaffold.load.title;"
+	drawintitlebar-platforms="mac"
 	onload="Scaffold_Load.onLoad()"
 	class="zotero-dialog"
 	style="min-width: 500px;">
 <dialog buttons="cancel,accept"
 	id="scaffold-load">
 	<script src="load.js"/>
+	<script src="chrome://zotero/content/titlebar.js"/>
 	<richlistbox id="listbox" class="theme-listbox"/>
 </dialog>
 </window>
diff --git a/chrome/content/zotero/attachLink.xhtml b/chrome/content/zotero/attachLink.xhtml
index bc1382fae9..bec59644a1 100644
--- a/chrome/content/zotero/attachLink.xhtml
+++ b/chrome/content/zotero/attachLink.xhtml
@@ -8,12 +8,14 @@
 	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
 	xmlns:html="http://www.w3.org/1999/xhtml"
 	title="&zotero.attachLink.title;"
+	drawintitlebar-platforms="mac"
 	onload="Zotero_AttachLink.load()">
 <dialog
 	buttons="accept,cancel"
 	id="zotero-attach-uri-dialog">
 	
 	<script src="include.js"/>
+	<script src="titlebar.js"/>
 	<script src="attachLink.js"/>
 	
 	<vbox id="zotero-attach-uri-container">
diff --git a/chrome/content/zotero/bibliography.xhtml b/chrome/content/zotero/bibliography.xhtml
index d7a4e89c3c..2af9de6e24 100644
--- a/chrome/content/zotero/bibliography.xhtml
+++ b/chrome/content/zotero/bibliography.xhtml
@@ -11,12 +11,14 @@
 	id="bibliography-window"
 	class="bibliography-window"
 	title="&zotero.bibliography.title;"
+	drawintitlebar-platforms="mac"
 	onload="Zotero_File_Interface_Bibliography.init()">
 <dialog
 	buttons="cancel,accept"
 	id="zotero-bibliography">
 
 	<script src="include.js"/>
+	<script src="titlebar.js"/>
 	<script src="bibliography.js"/>
 	
 	<vbox id="zotero-bibliography-container">
diff --git a/chrome/content/zotero/createParentDialog.xhtml b/chrome/content/zotero/createParentDialog.xhtml
index 7fa2d1c0ca..61fec135cb 100644
--- a/chrome/content/zotero/createParentDialog.xhtml
+++ b/chrome/content/zotero/createParentDialog.xhtml
@@ -13,6 +13,7 @@
 	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
 	xmlns:html="http://www.w3.org/1999/xhtml"
 	title="&zotero.createParent.title;"
+	drawintitlebar-platforms="mac"
 	onload="doLoad();"
 	onunload="doUnload();">
 <dialog
@@ -27,6 +28,7 @@
 	<script src="chrome://global/content/globalOverlay.js"/>
 	<script src="chrome://global/content/editMenuOverlay.js"/>
 	<script src="include.js"/>
+	<script src="titlebar.js"/>
 	<script src="editMenuOverlay.js"/>
 	<script src="lookup.js"/>
 	<script src="createParentDialog.js"/>
diff --git a/chrome/content/zotero/exportOptions.xhtml b/chrome/content/zotero/exportOptions.xhtml
index d90b2f42d9..27f5fc9ddc 100644
--- a/chrome/content/zotero/exportOptions.xhtml
+++ b/chrome/content/zotero/exportOptions.xhtml
@@ -10,6 +10,7 @@
 	xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
 	xmlns:html="http://www.w3.org/1999/xhtml"
 	title="&zotero.exportOptions.title;"
+	drawintitlebar-platforms="mac"
 	onload="Zotero_File_Interface_Export.init()">
 <dialog
 	buttons="cancel,accept"
@@ -18,6 +19,7 @@
 	<script>
 		var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 		Services.scriptloader.loadSubScript("chrome://zotero/content/include.js", this);
+		Services.scriptloader.loadSubScript("chrome://zotero/content/titlebar.js", this);
 		Services.scriptloader.loadSubScript("chrome://zotero/content/customElements.js", this);
 	</script>
 	<script src="charsetMenu.js"/>
diff --git a/chrome/content/zotero/feedSettings.xhtml b/chrome/content/zotero/feedSettings.xhtml
index 6ebe08680a..5d9cc2ceff 100644
--- a/chrome/content/zotero/feedSettings.xhtml
+++ b/chrome/content/zotero/feedSettings.xhtml
@@ -11,11 +11,13 @@
 	title="&zotero.feedSettings.title;" buttons="cancel,accept"
 	buttonlabelaccept="&zotero.feedSettings.saveButton.label;"
 	id="zotero-feed-settings"
+	drawintitlebar-platforms="mac"
 	onload="Zotero_Feed_Settings.init()">
 <dialog>
 	<script>
 		var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 		Services.scriptloader.loadSubScript("chrome://zotero/content/include.js", this);
+		Services.scriptloader.loadSubScript("chrome://zotero/content/titlebar.js", this);
 		Services.scriptloader.loadSubScript("chrome://zotero/content/customElements.js", this);
 		Services.scriptloader.loadSubScript("chrome://zotero/content/feedSettings.js", this);
 	</script>
diff --git a/chrome/content/zotero/ingester/selectitems.xhtml b/chrome/content/zotero/ingester/selectitems.xhtml
index 218fde36c1..4c2da40d4f 100755
--- a/chrome/content/zotero/ingester/selectitems.xhtml
+++ b/chrome/content/zotero/ingester/selectitems.xhtml
@@ -34,6 +34,7 @@
 	class="zotero-dialog"
 	title="&zotero.selectitems.title;" width="400" height="330"
 	persist="width height screenX screenY"
+	drawintitlebar-platforms="mac"
 	onload="Zotero_Ingester_Interface_SelectItems.init()">
 <dialog 
 	buttons="cancel,accept"
@@ -42,6 +43,7 @@
 	<script>
 		var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 		Services.scriptloader.loadSubScript("chrome://zotero/content/include.js", this);
+		Services.scriptloader.loadSubScript("chrome://zotero/content/titlebar.js", this);
 		Services.scriptloader.loadSubScript("chrome://zotero/content/ingester/selectitems.js", this);
 		Services.scriptloader.loadSubScript("chrome://zotero/content/customElements.js", this);
 	</script>
diff --git a/chrome/content/zotero/longTagFixer.xhtml b/chrome/content/zotero/longTagFixer.xhtml
index fb29a62ea2..1980471722 100644
--- a/chrome/content/zotero/longTagFixer.xhtml
+++ b/chrome/content/zotero/longTagFixer.xhtml
@@ -10,6 +10,7 @@
 	title="&zotero.sync.error;"
 	id="zotero-long-tag-fixer-window"
 	class="zotero-dialog"
+	drawintitlebar-platforms="mac"
 	onload="Zotero_Long_Tag_Fixer.init()">
 <dialog
 	id="zotero-long-tag-fixer"
@@ -64,6 +65,7 @@
 		</tabpanels>
 	</tabbox>
 	<script src="include.js"/>
+	<script src="titlebar.js"/>
 	<script src="longTagFixer.js"/>
 </dialog>
 </window>
\ No newline at end of file
diff --git a/chrome/content/zotero/newCollectionDialog.xhtml b/chrome/content/zotero/newCollectionDialog.xhtml
index 43df4e2fe8..952e8d66ac 100644
--- a/chrome/content/zotero/newCollectionDialog.xhtml
+++ b/chrome/content/zotero/newCollectionDialog.xhtml
@@ -38,11 +38,13 @@
 	data-l10n-id="new-collection-dialog"
 	data-l10n-attrs="title"
 	width="350"
+	drawintitlebar-platforms="mac"
 	onload="Zotero_New_Collection_Dialog._handleLoad()"
 >
 	<script>
 		const { Services } = ChromeUtils.import('resource://gre/modules/Services.jsm');
 		Services.scriptloader.loadSubScript('chrome://zotero/content/include.js', this);
+		Services.scriptloader.loadSubScript('chrome://zotero/content/titlebar.js', this);
 		Services.scriptloader.loadSubScript('chrome://zotero/content/customElements.js', this);
 		Services.scriptloader.loadSubScript('chrome://zotero/content/newCollectionDialog.js', this);
 	</script>
diff --git a/chrome/content/zotero/searchDialog.xhtml b/chrome/content/zotero/searchDialog.xhtml
index 984f1c6a8e..91da62bec6 100644
--- a/chrome/content/zotero/searchDialog.xhtml
+++ b/chrome/content/zotero/searchDialog.xhtml
@@ -11,6 +11,7 @@
 	orient="vertical"
 	onload="doLoad();"
 	onunload="doUnload();"
+	drawintitlebar-platforms="mac"
 	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
 	xmlns:html="http://www.w3.org/1999/xhtml"
 	style="padding:2em">
@@ -21,6 +22,7 @@
 	<script>
 		var {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
 		Services.scriptloader.loadSubScript("chrome://zotero/content/include.js", this);
+		Services.scriptloader.loadSubScript("chrome://zotero/content/titlebar.js", this);
 		Services.scriptloader.loadSubScript("chrome://zotero/content/customElements.js", this);
 		Services.scriptloader.loadSubScript("chrome://zotero/content/searchDialog.js", this);
 	</script>
diff --git a/chrome/content/zotero/tagColorChooser.xhtml b/chrome/content/zotero/tagColorChooser.xhtml
index 2a799c3592..d8eccbd51c 100644
--- a/chrome/content/zotero/tagColorChooser.xhtml
+++ b/chrome/content/zotero/tagColorChooser.xhtml
@@ -34,6 +34,7 @@
 	xmlns:html="http://www.w3.org/1999/xhtml"
 	title="&zotero.tagColorChooser.title;"
 	onload="Zotero_Tag_Color_Chooser.init()"
+	drawintitlebar-platforms="mac"
 	width="350"
 	height="140">
 <dialog
@@ -45,6 +46,7 @@
 		var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 		Services.scriptloader.loadSubScript("chrome://zotero/content/include.js", this);
+		Services.scriptloader.loadSubScript("chrome://zotero/content/titlebar.js", this);
 		Services.scriptloader.loadSubScript("chrome://zotero/content/tagColorChooser.js", this);
 
 		// Custom elements