From f084b8c8ad1a50f8871d4fe0b8476513b0b10be2 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Wed, 17 Jan 2024 23:15:21 -0500
Subject: [PATCH] Move density options to separate submenu in View

---
 chrome/content/zotero/zoteroPane.xhtml | 29 ++++++++++++++------------
 chrome/locale/en-US/zotero/zotero.ftl  |  3 +++
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/chrome/content/zotero/zoteroPane.xhtml b/chrome/content/zotero/zoteroPane.xhtml
index 503bf05386..c5dda80876 100644
--- a/chrome/content/zotero/zoteroPane.xhtml
+++ b/chrome/content/zotero/zoteroPane.xhtml
@@ -531,19 +531,6 @@
 										type="radio"
 									/>
 									<menuseparator/>
-									<menuitem
-										id="view-menuitem-ui-density-compact"
-										data-l10n-id="menu-ui-density-compact"
-										name="menu-ui-density"
-										type="radio"
-									/>
-									<menuitem
-										id="view-menuitem-ui-density-comfortable"
-										data-l10n-id="menu-ui-density-comfortable"
-										name="menu-ui-density"
-										type="radio"
-									/>
-									<menuseparator/>
 									<menuitem
 										id="view-menuitem-collections-pane"
 										label="&collectionsPane.label;"
@@ -561,6 +548,22 @@
 									/>
 								</menupopup>
 							</menu>
+							<menu id="density-menu" data-l10n-id="menu-density">
+								<menupopup oncommand="ZoteroStandalone.onViewMenuItemClick(event)">
+									<menuitem
+										id="view-menuitem-ui-density-compact"
+										data-l10n-id="menu-ui-density-compact"
+										name="menu-ui-density"
+										type="radio"
+									/>
+									<menuitem
+										id="view-menuitem-ui-density-comfortable"
+										data-l10n-id="menu-ui-density-comfortable"
+										name="menu-ui-density"
+										type="radio"
+									/>
+							</menupopup>
+							</menu>
 							<menu id="font-size-menu"
 									label="&fontSize.label;">
 								<menupopup oncommand="ZoteroStandalone.onViewMenuItemClick(event)">
diff --git a/chrome/locale/en-US/zotero/zotero.ftl b/chrome/locale/en-US/zotero/zotero.ftl
index cd478a4e9d..7295ad7c47 100644
--- a/chrome/locale/en-US/zotero/zotero.ftl
+++ b/chrome/locale/en-US/zotero/zotero.ftl
@@ -1,3 +1,6 @@
+menu-density =
+    .label = Density
+
 add-attachment = Add Attachment
 new-note = New Note