From 9510eef69aefa23431615fb0ce8762d7083c599a Mon Sep 17 00:00:00 2001
From: Abe Jellinek <jellinek@berkeley.edu>
Date: Fri, 24 Jan 2025 15:04:43 -0500
Subject: [PATCH] Scaffold: Fix select dialog overflow (again!)

And restore button spacing.
---
 chrome/content/scaffold/select.js    |  4 ++--
 chrome/content/scaffold/select.xhtml | 14 +++++---------
 scss/scaffold.scss                   | 16 +++++++++++++---
 3 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/chrome/content/scaffold/select.js b/chrome/content/scaffold/select.js
index e2e266b6a8..30afd7b171 100644
--- a/chrome/content/scaffold/select.js
+++ b/chrome/content/scaffold/select.js
@@ -43,8 +43,8 @@ Zotero_Ingester_Interface_SelectItems.init = function () {
 		() => Zotero_Ingester_Interface_SelectItems.acceptSelection());
 
 	// Set font size from pref
-	var sbc = document.getElementById('zotero-select-items-container');
-	Zotero.UIProperties.registerRoot(sbc);
+	var dialog = document.querySelector('dialog');
+	Zotero.UIProperties.registerRoot(dialog);
 	
 	this.io = window.arguments[0];
 	var listbox = document.getElementById("zotero-selectitems-links");
diff --git a/chrome/content/scaffold/select.xhtml b/chrome/content/scaffold/select.xhtml
index d2cf195e0e..9be5cbbbed 100755
--- a/chrome/content/scaffold/select.xhtml
+++ b/chrome/content/scaffold/select.xhtml
@@ -48,14 +48,10 @@
 		Services.scriptloader.loadSubScript("chrome://zotero/content/customElements.js", this);
 	</script>
 	
-	<vbox id="zotero-select-items-container" flex="1">
-		<box flex="1">
-			<richlistbox id="zotero-selectitems-links" flex="1"></richlistbox>
-		</box>
-		<hbox id="zotero-select-items-buttons">
-			<button label="Select All" oncommand="Zotero_Ingester_Interface_SelectItems.selectAll()"/>
-			<button label="Deselect All" oncommand="Zotero_Ingester_Interface_SelectItems.selectAll(true)"/>
-		</hbox>
-	</vbox>
+	<richlistbox id="zotero-selectitems-links"></richlistbox>
+	<hbox id="zotero-select-items-buttons">
+		<button label="Select All" oncommand="Zotero_Ingester_Interface_SelectItems.selectAll()"/>
+		<button label="Deselect All" oncommand="Zotero_Ingester_Interface_SelectItems.selectAll(true)"/>
+	</hbox>
 </dialog>
 </window>
diff --git a/scss/scaffold.scss b/scss/scaffold.scss
index 1d3a71a128..43a92dbd7e 100644
--- a/scss/scaffold.scss
+++ b/scss/scaffold.scss
@@ -29,20 +29,30 @@ $scaffold-toolbarbutton-icons: (
 	}
 };
 
+#scaffold, #zotero-select-item-dialog {
+	@include contain-richlistbox;
+	@include macOS-normalize-controls;
+}
+
 #scaffold {
 	min-height: 600px;
-	@include contain-richlistbox;
 }
 
 #zotero-select-item-dialog {
 	max-width: 400px;
+	min-height: 330px;
 	max-height: 330px;
-	@include contain-richlistbox;
 }
 
-// Prevent contain-richlistbox from squishing the buttons
+#zotero-selectitems-links {
+	flex: 1 1 0;
+}
+
 #zotero-select-items-buttons {
+	// Prevent contain-richlistbox from squishing the buttons
 	flex-shrink: 0;
+	gap: 6px;
+	padding-top: 4px;
 }
 
 .menubar-container {